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 2012/11/29 01:01:18 UTC
[39/50] [abbrv] git commit: CLOUDSTACK-537: cloudstack UI - zone
wizard - create default guest network - Only pass
gateway/netmask/startIp/endIp/VlanId to CreateNetwork API if it's an Advanced
zone with SG. Do not pass them to CreateNetwork API if it's a
CLOUDSTACK-537: cloudstack UI - zone wizard - create default guest network - Only pass gateway/netmask/startIp/endIp/VlanId to CreateNetwork API if it's an Advanced zone with SG. Do not pass them to CreateNetwork API if it's a Basic zone.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d9ac544b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d9ac544b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d9ac544b
Branch: refs/heads/api_refactoring
Commit: d9ac544b063cffc11c1abf8a26200872d018aa09
Parents: e5ced5e
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Nov 26 11:23:48 2012 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Nov 26 11:23:48 2012 -0800
----------------------------------------------------------------------
ui/scripts/zoneWizard.js | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d9ac544b/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 25dae95..0c7424d 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -2351,18 +2351,23 @@
zoneid: args.data.returnedZone.id,
name: 'defaultGuestNetwork',
displaytext: 'defaultGuestNetwork',
- networkofferingid: args.data.zone.networkOfferingId,
- gateway: args.data.guestTraffic.guestGateway,
- netmask: args.data.guestTraffic.guestNetmask,
- startip: args.data.guestTraffic.guestStartIp,
- vlan: args.data.guestTraffic.vlanId
+ networkofferingid: args.data.zone.networkOfferingId
};
- if(args.data.guestTraffic.guestEndIp != null && args.data.guestTraffic.guestEndIp.length > 0) {
+ //Advanced zone with SG
+ if(args.data.zone.networkType == "Advanced" && args.data.zone.sgEnabled == true) {
$.extend(data, {
- endip: args.data.guestTraffic.guestEndIp
- });
- }
+ gateway: args.data.guestTraffic.guestGateway,
+ netmask: args.data.guestTraffic.guestNetmask,
+ startip: args.data.guestTraffic.guestStartIp,
+ vlan: args.data.guestTraffic.vlanId
+ });
+ if(args.data.guestTraffic.guestEndIp != null && args.data.guestTraffic.guestEndIp.length > 0) {
+ $.extend(data, {
+ endip: args.data.guestTraffic.guestEndIp
+ });
+ }
+ }
$.ajax({
url: createURL('createNetwork'),