mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
cloudstack 3.0 new UI - deployVM - step 5 - (1) Show network list if it's an advanced zone. (2) Show security group list if it's a Basic zone with SecurityGroup service. (3) Show nothing if it's a Basic zone without SecurityGroup service.
This commit is contained in:
parent
9c7abbc95d
commit
0eb583df1a
@ -218,10 +218,10 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (selectedZoneObj.securitygroupsenabled == false) { //show network container
|
if (selectedZoneObj.networktype == "Advanced") { //Advanced zone. Show network list.
|
||||||
step5ContainerType = 'select-network';
|
step5ContainerType = 'select-network';
|
||||||
}
|
}
|
||||||
else if (selectedZoneObj.securitygroupsenabled == true) { // if security group is enabled
|
else { //Basic zone. Show securigy group list or nothing(when no SecurityGroup service in guest network)
|
||||||
var includingSecurityGroupService = false;
|
var includingSecurityGroupService = false;
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: createURL("listNetworks&trafficType=Guest&zoneId=" + selectedZoneObj.id),
|
url: createURL("listNetworks&trafficType=Guest&zoneId=" + selectedZoneObj.id),
|
||||||
@ -231,7 +231,7 @@
|
|||||||
//basic zone should have only one guest network returned in this API call
|
//basic zone should have only one guest network returned in this API call
|
||||||
var items = json.listnetworksresponse.network;
|
var items = json.listnetworksresponse.network;
|
||||||
if(items != null && items.length > 0) {
|
if(items != null && items.length > 0) {
|
||||||
var networkObj = items[0];
|
var networkObj = items[0]; //basic zone has only one guest network
|
||||||
var serviceObjArray = networkObj.service;
|
var serviceObjArray = networkObj.service;
|
||||||
for(var k = 0; k < serviceObjArray.length; k++) {
|
for(var k = 0; k < serviceObjArray.length; k++) {
|
||||||
if(serviceObjArray[k].name == "SecurityGroup") {
|
if(serviceObjArray[k].name == "SecurityGroup") {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user