Updated Branches: refs/heads/master 811c904fc -> 080a2dc9c
CLOUDSTACK-537: cloudstack UI - Advanced SG-Enabled zone - zone wizard - network offering dropdown - exclude network offerings that include EIP, ELB service. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/080a2dc9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/080a2dc9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/080a2dc9 Branch: refs/heads/master Commit: 080a2dc9c5043ad600ce632c3904c236e9f19c1b Parents: 811c904 Author: Jessica Wang <[email protected]> Authored: Mon Nov 26 13:08:30 2012 -0800 Committer: Jessica Wang <[email protected]> Committed: Mon Nov 26 13:08:30 2012 -0800 ---------------------------------------------------------------------- ui/scripts/zoneWizard.js | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/080a2dc9/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index e238a19..ef874d4 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -455,11 +455,14 @@ }); } }); - + 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 doesn'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
