Skip to content

Commit b02e9f0

Browse files
CLOUDSTACK-9235: Autoscale button is missing in VPC
In case of VPC, it checks the services available. If LB is there, It checks the provider is Netscaler then it shows the button or hides it.
1 parent 80703ca commit b02e9f0

1 file changed

Lines changed: 31 additions & 18 deletions

File tree

ui/scripts/network.js

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3643,22 +3643,7 @@
36433643
success: function(json) {
36443644
var networkOffering = json.listnetworkofferingsresponse.networkoffering[0];
36453645
var services = networkOffering.service;
3646-
if (services != null) {
3647-
for (var i = 0; i < services.length; i++) {
3648-
if (services[i].name == 'Lb') {
3649-
var providers = services[i].provider;
3650-
if (providers != null) {
3651-
for (var k = 0; k < providers.length; k++) {
3652-
if (providers[k].name == 'Netscaler') {
3653-
lbProviderIsNetscaler = true;
3654-
break;
3655-
}
3656-
}
3657-
}
3658-
break;
3659-
}
3660-
}
3661-
}
3646+
lbProviderIsNetscaler = checkIfNetScalerProviderIsEnabled(services);
36623647
}
36633648
});
36643649
if (lbProviderIsNetscaler == true) { //AutoScale is only supported on Netscaler (but not on any other provider like VirtualRouter)
@@ -3667,8 +3652,16 @@
36673652
return 2; //hide Autoscale button (both header and form)
36683653
}
36693654
} else { //from VPC section
3670-
//VPC doesn't support autoscale
3671-
return 2;
3655+
var lbProviderIsNetscaler;
3656+
var services = args.context.vpc[0].service;
3657+
3658+
lbProviderIsNetscaler = checkIfNetScalerProviderIsEnabled(services);
3659+
3660+
if (lbProviderIsNetscaler == true) { //AutoScale is only supported on Netscaler (but not on any other provider like VirtualRouter)
3661+
return false; //show AutoScale button
3662+
} else {
3663+
return 2; //hide Autoscale button (both header and form)
3664+
}
36723665
}
36733666
}
36743667
},
@@ -6525,6 +6518,26 @@
65256518
}
65266519
};
65276520

6521+
function checkIfNetScalerProviderIsEnabled(services) {
6522+
if (services != null) {
6523+
for (var i = 0; i < services.length; i++) {
6524+
if (services[i].name == 'Lb') {
6525+
var providers = services[i].provider;
6526+
if (providers != null) {
6527+
for (var k = 0; k < providers.length; k++) {
6528+
if (providers[k].name == 'Netscaler') {
6529+
return true;
6530+
}
6531+
}
6532+
}
6533+
return false;
6534+
}
6535+
}
6536+
}
6537+
6538+
return false;
6539+
}
6540+
65286541
function getExtaPropertiesForIpObj(ipObj, args) {
65296542
if (!('vpc' in args.context)) { //***** Guest Network section > Guest Network page > IP Address page *****
65306543
var services = args.context.networks[0].service;

0 commit comments

Comments
 (0)