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/13 19:20:01 UTC
git commit: CS-16802: cloudstack UI - Zone Wizard - add "Isolation
Mode" (VLAN, Security Group) under advanced zone option.
Updated Branches:
refs/heads/master a61cb24e9 -> 2f27746d7
CS-16802: cloudstack UI - Zone Wizard - add "Isolation Mode" (VLAN, Security Group) under advanced zone option.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2f27746d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2f27746d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2f27746d
Branch: refs/heads/master
Commit: 2f27746d71eb447b94b7916b30d413c4854b4336
Parents: a61cb24
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Nov 12 14:13:25 2012 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Tue Nov 13 10:19:36 2012 -0800
----------------------------------------------------------------------
ui/scripts/zoneWizard.js | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2f27746d/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 46ed749..1183f62 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1249,7 +1249,7 @@
var data = args.data;
var stepFns = {
- addZone: function() {
+ addZone: function() {
message(dictionary['message.creating.zone']);
var array1 = [];
@@ -1258,6 +1258,13 @@
if(networkType == "Advanced") {
if(args.data.zone.guestcidraddress != null && args.data.zone.guestcidraddress.length > 0)
array1.push("&guestcidraddress=" + todb(args.data.zone.guestcidraddress));
+
+ if(args.data.zone.isolationMode != null) {
+ if(args.data.zone.isolationMode == "SG")
+ array1.push("&securitygroupenabled=true");
+ else if(args.data.zone.isolationMode == "VLAN")
+ array1.push("&securitygroupenabled=false");
+ }
}
array1.push("&name=" + todb(args.data.zone.name));