From ac89c3e7e1ed3fbb5f207de8fdf1ebf6ba658836 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Wed, 27 Feb 2013 16:33:58 -0800
Subject: [PATCH] CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone
 detail - guest network - network detail - View IP Ranges (only available in
 Advanced zone) - add IPv6 Start IP, IPv6 End IP field to listView and Add IP
 Range dialog.

---
 ui/scripts/system.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 7081d1bc12b..2f105aff2ae 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -9946,8 +9946,10 @@
         listView: {
           section: 'guest-IP-range',
           fields: {
-            startip: { label: 'label.start.IP' },
-            endip: { label: 'label.end.IP' }
+            startip: { label: 'IPv4 Start IP' },
+            endip: { label: 'IPv4 End IP' },
+            startipv6: { label: 'IPv6 Start IP' },
+            endipv6: { label: 'IPv6 End IP' }
           },
 
           dataProvider: function(args) {
@@ -9968,16 +9970,24 @@
               createForm: {
                 title: 'label.add.ip.range',
                 fields: {
-                  guestStartIp: { label: 'label.guest.start.ip' },
-                  guestEndIp: { label: 'label.guest.end.ip' }
+                  startipv4: { label: 'IPv4 Start IP' },
+                  endipv4: { label: 'IPv4 End IP' },
+                  startipv6: { label: 'IPv6 Start IP' },
+                  endipv6: { label: 'IPv6 End IP' }
                 }
               },
               action: function(args) {
                 var array2 = [];
-                array2.push("&startip=" + args.data.guestStartIp);
-                var endip = args.data.guestEndIp;
-                if(endip != null && endip.length > 0)
-                  array2.push("&endip=" + endip);
+                if(args.data.startipv4 != null && args.data.startipv4.length > 0)
+                  array2.push("&startip=" + args.data.startipv4);                
+                if(args.data.endipv4 != null && args.data.endipv4.length > 0)
+                  array2.push("&endip=" + args.data.endipv4);
+                
+                if(args.data.startipv6 != null && args.data.startipv6.length > 0)
+                    array2.push("&startipv6=" + args.data.startipv6);                
+                  if(args.data.endipv6 != null && args.data.endipv6.length > 0)
+                    array2.push("&endipv6=" + args.data.endipv6);
+                
                 $.ajax({
                   url: createURL("createVlanIpRange&forVirtualNetwork=false&networkid=" + args.context.networks[0].id + array2.join("")),
                   dataType: "json",