cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: CLOUDSTACK-477: cloudstack UI - zone wizard - When Advanced/SecurityGroup is selected, pass forVirtualNetwork=false to createVlanIpRange API.
Date Wed, 14 Nov 2012 01:00:46 GMT
Updated Branches:
  refs/heads/master 5122cb955 -> 9f8d1e004


CLOUDSTACK-477: cloudstack UI - zone wizard - When Advanced/SecurityGroup is selected, pass
forVirtualNetwork=false to createVlanIpRange API.


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

Branch: refs/heads/master
Commit: 9f8d1e00486fa1fc28ed5fe5fc7bdbffbc760e0c
Parents: 5122cb9
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Tue Nov 13 16:59:48 2012 -0800
Committer: Jessica Wang <jessica.wang@citrix.com>
Committed: Tue Nov 13 16:59:48 2012 -0800

----------------------------------------------------------------------
 ui/scripts/zoneWizard.js |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9f8d1e00/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 1183f62..6cbcb69 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -2440,7 +2440,17 @@
               if(this.endip != null && this.endip.length > 0)
                 array1.push("&endip=" + this.endip);
 
-              array1.push("&forVirtualNetwork=true");
+							if(args.data.zone.networkType == "Basic") {
+                array1.push("&forVirtualNetwork=true");
+							}
+							else if(args.data.zone.networkType == "Advanced") {							  
+								if(args.data.zone.isolationMode	== "VLAN") { //VLAN
+								  array1.push("&forVirtualNetwork=true");
+								}
+								else { //Security Group
+								  array1.push("&forVirtualNetwork=false");
+								}
+							}
 
               $.ajax({
                 url: createURL("createVlanIpRange" + array1.join("")),


Mime
View raw message