CLOUDSTACK-537: cloudstack UI - Advanced SG-Enabled zone - zone wizard - network offering dropdown - exclude network offerings that include EIP, ELB service.

This commit is contained in:
Jessica Wang 2012-11-26 13:08:30 -08:00
parent 811c904fc3
commit 080a2dc9c5

View File

@ -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