From d9ac544b063cffc11c1abf8a26200872d018aa09 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 26 Nov 2012 11:23:48 -0800 Subject: [PATCH] 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. --- ui/scripts/zoneWizard.js | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 25dae959929..0c7424d01bd 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'),