You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/02/25 22:10:33 UTC

git commit: refs/heads/ipv6-UI - IPV6 UI development

Updated Branches:
  refs/heads/ipv6-UI [created] 8ae7cd2a3


IPV6 UI development


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8ae7cd2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8ae7cd2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8ae7cd2a

Branch: refs/heads/ipv6-UI
Commit: 8ae7cd2a3331401cb8c9936031220befe9225db6
Parents: b174165
Author: Pranav Saxena <pr...@citrix.com>
Authored: Tue Feb 26 02:39:44 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Tue Feb 26 02:39:44 2013 +0530

----------------------------------------------------------------------
 ui/scripts/system.js |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8ae7cd2a/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 3d99612..f119a00 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -1421,7 +1421,19 @@
                           networkdomain: {
                             label: 'label.network.domain',
                             docID: 'helpGuestNetworkZoneNetworkDomain'
-                          }
+                          },
+                          
+                         ipv6: { label:'Enable IPV6' , isBoolean:true , isChecked:false },
+
+                         startipv6:{ label:'Start IPV6' , isHidden:true, dependsOn:'ipv6', validation:{required:true}},
+
+                         endipv6: {label: 'End IPV6' , isHidden:true , dependsOn:'ipv6', validation:{required:true}},
+
+                         ip6gateway: {label: 'IPV6 Gateway' , isHidden:true , dependsOn: 'ipv6', validation:{required:true}},
+
+                         ip6cidr:{label: 'IPV6 CIDR' , isHidden:true, dependsOn: 'ipv6', validation:{required:true}}
+
+ 
                         }
                       },
 
@@ -1486,7 +1498,25 @@
 												if(args.data.networkdomain != null && args.data.networkdomain.length > 0)
 													array1.push("&networkdomain=" + todb(args.data.networkdomain));
 
-                        $.ajax({
+                       
+                                                                                                                                                                                         if(args.$form.find('.form-item[rel=ipv6]').find('input[type=checkbox]').is(':Checked') == true && selectedNetworkOfferingObj.guestiptype == "Shared") {
+
+                 if(args.data.startipv6 !="")
+                     array1.push("&startipv6=" +todb(args.data.startipv6));
+
+                 if(args.data.endipv6 !="")
+                      array1.push("&endipv6=" +todb(args.data.endipv6));
+
+                 if(args.data.ip6gateway !="")
+                     array1.push("&ip6gateway=" +todb(args.data.ip6gateway));
+
+                 if(args.data.ip6cidr !="")
+                   array1.push("&ip6cidr=" +todb(args.data.ip6cidr));
+
+                     }
+
+
+                       $.ajax({
                           url: createURL("createNetwork" + array1.join("")),
                           dataType: "json",
                           success: function(json) {