diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index 402984329d5..8730a7a3a8a 100644 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -596,7 +596,7 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements */ if (!validateHealthCheck(cmd)) { throw new InvalidParameterValueException( - "Failed to create HealthCheck policy: Validation Failed (HealthCheck Policy is not supported by LB Provider for the LB rule id :)" + cmd.getLbRuleId()); + "Failed to create HealthCheck policy: Validation Failed (HealthCheck Policy is not supported by LB Provider for the LB rule id :" + cmd.getLbRuleId() + ")"); } /* Validation : check for the multiple hc policies to the rule id */ diff --git a/ui/scripts/autoscaler.js b/ui/scripts/autoscaler.js index bbd6d9ac977..e8ac0443662 100644 --- a/ui/scripts/autoscaler.js +++ b/ui/scripts/autoscaler.js @@ -1116,7 +1116,7 @@ var apiCmd, apiCmdRes; if (!('multiRules' in args.context)) { //from a new LB var data = { - zoneid: args.context.networks[0].zoneid, //get zoneid from args.context.networks[0] instead of args.context.ipAddresses[0] because args.context.ipAddresses is null when adding AutoScale rule from Add Load Balancer tab in Network page + zoneid: args.context.networks[0].zoneid ? args.context.networks[0].zoneid : args.context.ipAddresses[0].zoneid, //get zoneid from args.context.networks[0]. If it is not null then get it from args.context.ipAddresses[0] because args.context.ipAddresses is null when adding AutoScale rule from Add Load Balancer tab in Network page serviceofferingid: args.data.serviceOfferingId, templateid: args.data.templateNames, destroyvmgraceperiod: args.data.destroyVMgracePeriod, diff --git a/ui/scripts/network.js b/ui/scripts/network.js index d96dbbc5240..a978d07265f 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3673,22 +3673,7 @@ success: function(json) { var networkOffering = json.listnetworkofferingsresponse.networkoffering[0]; var services = networkOffering.service; - if (services != null) { - for (var i = 0; i < services.length; i++) { - if (services[i].name == 'Lb') { - var providers = services[i].provider; - if (providers != null) { - for (var k = 0; k < providers.length; k++) { - if (providers[k].name == 'Netscaler') { - lbProviderIsNetscaler = true; - break; - } - } - } - break; - } - } - } + lbProviderIsNetscaler = checkIfNetScalerProviderIsEnabled(services); } }); if (lbProviderIsNetscaler == true) { //AutoScale is only supported on Netscaler (but not on any other provider like VirtualRouter) @@ -3697,8 +3682,16 @@ return 2; //hide Autoscale button (both header and form) } } else { //from VPC section - //VPC doesn't support autoscale - return 2; + var lbProviderIsNetscaler; + var services = args.context.vpc[0].service; + + lbProviderIsNetscaler = checkIfNetScalerProviderIsEnabled(services); + + if (lbProviderIsNetscaler == true) { //AutoScale is only supported on Netscaler (but not on any other provider like VirtualRouter) + return false; //show AutoScale button + } else { + return 2; //hide Autoscale button (both header and form) + } } } }, diff --git a/ui/scripts/ui-custom/autoscaler.js b/ui/scripts/ui-custom/autoscaler.js index ca37bea3ce3..52eb5ea334b 100644 --- a/ui/scripts/ui-custom/autoscaler.js +++ b/ui/scripts/ui-custom/autoscaler.js @@ -333,7 +333,7 @@ var $loading = $('
').addClass('loading-overlay').appendTo($autoscalerDialog); $autoscalerDialog.dialog({ - title: 'label.autoscale.configuration.wizard', + title: _l('label.autoscale.configuration.wizard'), width: 825, height: 600, draggable: true, diff --git a/ui/scripts/ui-custom/healthCheck.js b/ui/scripts/ui-custom/healthCheck.js index 3280dd9c821..43070c3d211 100644 --- a/ui/scripts/ui-custom/healthCheck.js +++ b/ui/scripts/ui-custom/healthCheck.js @@ -35,9 +35,9 @@ var topFieldForm, bottomFieldForm, $topFieldForm, $bottomFieldForm; var topfields = forms.topFields; - var $healthCheckDesc = $('
' + 'label.health.check.message.desc' + '
').addClass('health-check-description'); - var $healthCheckConfigTitle = $('


' + 'label.health.check.configurations.options' + '
').addClass('health-check-config-title'); - var $healthCheckAdvancedTitle = $('


' + 'label.health.check.advanced.options' + '
').addClass('health-check-advanced-title'); + var $healthCheckDesc = $('
' + _l('label.health.check.message.desc') + '
').addClass('health-check-description'); + var $healthCheckConfigTitle = $('


' + _l('label.health.check.configurations.options') + '
').addClass('health-check-config-title'); + var $healthCheckAdvancedTitle = $('


' + _l('label.health.check.advanced.options') + '
').addClass('health-check-advanced-title'); var $healthCheckDialog = $('
').addClass('health-check'); $healthCheckDialog.append($healthCheckDesc); @@ -200,7 +200,7 @@ error: function(json) { cloudStack.dialog.notice({ - message: _s(json.responseText) + message: parseXMLHttpResponse(json) }); //Error message in the API needs to be improved $healthCheckDialog.dialog('close'); $('.overlay').remove(); @@ -361,8 +361,8 @@ } $healthCheckDialog.dialog({ - title: 'label.health.check.wizard', - width: 600, + title: _l('label.health.check.wizard'), + width: 630, height: 600, draggable: true, closeonEscape: false,