From 811c904fc34bd3608dacbaf7b4e2892e0af524d8 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 26 Nov 2012 13:06:30 -0800 Subject: [PATCH] CLOUDSTACK-537: cloudstack UI - Advanced SG-Enabled zone - zone wizard - network offering dropdown - populate only network offerings that include SecurityGroup service. --- ui/scripts/zoneWizard.js | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index c43a747c67c..e238a191a2a 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -455,15 +455,20 @@ }); } }); - - if(args.hypervisor != "VMware" && args.hypervisor != "BareMetal") { - availableNetworkOfferingObjs.push(thisNetworkOffering); - } - else { //only network offerings that does not include EIP, ELB, SG - if(thisNetworkOffering.havingSG != true && thisNetworkOffering.havingEIP != true && thisNetworkOffering.havingELB != true) { - availableNetworkOfferingObjs.push(thisNetworkOffering); + + if(thisNetworkOffering.havingEIP == true && thisNetworkOffering.havingELB == true) { //EIP ELB + if(args.hypervisor == "VMware" || args.hypervisor == "BareMetal") { //VMware, BareMetal don't support EIP ELB + return true; //move to next item in $.each() loop } - } + } + + if(args.context.zones[0]["network-model"] == "Advanced" && args.context.zones[0]["zone-advanced-sg-enabled"] == "on") { // Advanced SG-enabled zone + if(thisNetworkOffering.havingSG != true) { + return true; //move to next item in $.each() loop + } + } + + availableNetworkOfferingObjs.push(thisNetworkOffering); }); args.response.success({