apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-537: cloudstack UI - Advanced SG-Enabled zone - zone wizard - network offering dropdown - populate only network offerings that include SecurityGroup service.

Browse Source
This commit is contained in:
Jessica Wang 2012-11-26 13:06:30 -08:00
parent af79da5d80
commit 811c904fc3
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/scripts/zoneWizard.js
View File

@ -455,15 +455,20 @@
}); });
} }
}); });
if(args.hypervisor != "VMware" && args.hypervisor != "BareMetal") { if(thisNetworkOffering.havingEIP == true && thisNetworkOffering.havingELB == true) { //EIP ELB
availableNetworkOfferingObjs.push(thisNetworkOffering); if(args.hypervisor == "VMware" || args.hypervisor == "BareMetal") { //VMware, BareMetal don't support EIP ELB
} return true; //move to next item in $.each() loop
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(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({ args.response.success({