etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

This commit is contained in:
Jessica Wang 2012-11-26 11:23:48 -08:00
parent e5ced5e4f4
commit d9ac544b06
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ui/scripts/zoneWizard.js
View File

@ -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'),