From 9f8d1e00486fa1fc28ed5fe5fc7bdbffbc760e0c Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 13 Nov 2012 16:59:48 -0800 Subject: [PATCH] CLOUDSTACK-477: cloudstack UI - zone wizard - When Advanced/SecurityGroup is selected, pass forVirtualNetwork=false to createVlanIpRange API. --- ui/scripts/zoneWizard.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 1183f62b66a..6cbcb694234 100644 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -2440,7 +2440,17 @@ if(this.endip != null && this.endip.length > 0) array1.push("&endip=" + this.endip); - array1.push("&forVirtualNetwork=true"); + if(args.data.zone.networkType == "Basic") { + array1.push("&forVirtualNetwork=true"); + } + else if(args.data.zone.networkType == "Advanced") { + if(args.data.zone.isolationMode == "VLAN") { //VLAN + array1.push("&forVirtualNetwork=true"); + } + else { //Security Group + array1.push("&forVirtualNetwork=false"); + } + } $.ajax({ url: createURL("createVlanIpRange" + array1.join("")),