From 617cb5a0588ef72fea91d9917e792d76b70509aa Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 24 Aug 2011 14:03:12 -0700 Subject: [PATCH] cloudStack - pass "forVirtualNetwork=false" when creating IP range for public network in an security-group-enabled (advanced) zone. --- ui/scripts/cloud.core.network.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js index 5ff507ba9fa..0c3cd5dfb4d 100644 --- a/ui/scripts/cloud.core.network.js +++ b/ui/scripts/cloud.core.network.js @@ -678,10 +678,16 @@ function bindAddIpRangeToPublicNetworkButton() { var endip = $thisDialog.find("#add_publicip_vlan_endip").val(); //optional field (might be empty) if(endip != null && endip.length > 0) array1.push("&endip="+todb(endip)); - + + //zoneObj.networktype == "Advanced", only advanced zone has option to Add IP Range (in network node) + if(zoneObj.securitygroupsenabled == false) + array1.push("&forVirtualNetwork=true"); + else + array1.push("&forVirtualNetwork=false"); + // Add IP Range to public network $.ajax({ - data: createURL("command=createVlanIpRange&forVirtualNetwork=true&zoneId="+zoneObj.id+vlan+scopeParams+array1.join("")), + data: createURL("command=createVlanIpRange&zoneId="+zoneObj.id+vlan+scopeParams+array1.join("")), dataType: "json", success: function(json) { $thisDialog.find("#spinning_wheel").hide();