You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2012/11/16 00:53:13 UTC
git commit: CLOUDSTACK-496: cloudstack UI - zone wizard - replace
Isolation mode VLAN/SecurityGroup radio buttons with one single checkbox
SecurityGroup.
Updated Branches:
refs/heads/master 57aeb17a5 -> bcd60dab0
CLOUDSTACK-496: cloudstack UI - zone wizard - replace Isolation mode VLAN/SecurityGroup radio buttons with one single checkbox SecurityGroup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bcd60dab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bcd60dab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bcd60dab
Branch: refs/heads/master
Commit: bcd60dab09badbf15ba672ac1625f6bfb07d2abd
Parents: 57aeb17
Author: Jessica Wang <je...@citrix.com>
Authored: Thu Nov 15 15:52:28 2012 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Thu Nov 15 15:52:28 2012 -0800
----------------------------------------------------------------------
ui/scripts/zoneWizard.js | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bcd60dab/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index f2dd88c..9b4e2e8 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -253,7 +253,7 @@
$('.setup-guest-traffic').removeClass('basic');
$('.setup-guest-traffic').addClass('advanced');
- if(args.data["zone-isolation-mode"] == "VLAN") {
+ if(args.data["zone-advanced-sg-enabled"] != "on") {
//skip the step if OVS tunnel manager is enabled
skipGuestTrafficStep = false; //reset it before ajax call
$.ajax({
@@ -276,7 +276,7 @@
}
});
}
- else { //args.data["zone-isolation-mode"] == "SG"
+ else { //args.data["zone-advanced-sg-enabled"] == "on"
skipGuestTrafficStep = true;
}
}
@@ -309,10 +309,10 @@
}
else { //args.data['network-model'] == 'Advanced'
args.$form.find('[rel=networkOfferingId]').hide();
-
- if(args.data["zone-isolation-mode"] == "VLAN")
+
+ if(args.data["zone-advanced-sg-enabled"] != "on")
args.$form.find('[rel=guestcidraddress]').show();
- else //args.data["zone-isolation-mode"] == "SG"
+ else //args.data["zone-advanced-sg-enabled"] == "on
args.$form.find('[rel=guestcidraddress]').hide();
}
@@ -1264,20 +1264,16 @@
var array1 = [];
var networkType = args.data.zone.networkType; //"Basic", "Advanced"
array1.push("&networktype=" + todb(networkType));
- if(networkType == "Advanced") {
-
-
- if(args.data.zone.isolationMode != null) {
- if(args.data.zone.isolationMode == "VLAN") {
- array1.push("&securitygroupenabled=false");
-
- if(args.data.zone.guestcidraddress != null && args.data.zone.guestcidraddress.length > 0)
- array1.push("&guestcidraddress=" + todb(args.data.zone.guestcidraddress));
- }
- else { // args.data.zone.isolationMode == "SG"
- array1.push("&securitygroupenabled=true");
- }
- }
+ if(networkType == "Advanced") {
+ if(args.data.zone.sgEnabled != true) {
+ array1.push("&securitygroupenabled=false");
+
+ if(args.data.zone.guestcidraddress != null && args.data.zone.guestcidraddress.length > 0)
+ array1.push("&guestcidraddress=" + todb(args.data.zone.guestcidraddress));
+ }
+ else { // args.data.zone.sgEnabled == true
+ array1.push("&securitygroupenabled=true");
+ }
}
array1.push("&name=" + todb(args.data.zone.name));
@@ -2457,10 +2453,10 @@
array1.push("&forVirtualNetwork=true");
}
else if(args.data.zone.networkType == "Advanced") {
- if(args.data.zone.isolationMode == "VLAN") { //VLAN
+ if(args.data.zone.sgEnabled != true) {
array1.push("&forVirtualNetwork=true");
}
- else { //Security Group
+ else { //args.data.zone.sgEnabled == true
array1.push("&forVirtualNetwork=false");
}
}