CLOUDSTACK-9229: Autoscale policy creation failing in VPC due to zoneid missing in createAutoScaleVmProfile

Added a conditon to check whether the zoneid in networks is undefined,
If that is undefined, it gets the zoneid from ipaddresses argument.
Fixed a localization issue.
This commit is contained in:
Nitin Kumar Maharana 2016-01-07 16:57:54 +05:30
parent 80703ca33c
commit 8e778151e1
2 changed files with 2 additions and 2 deletions

View File

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

View File

@ -333,7 +333,7 @@
var $loading = $('<div>').addClass('loading-overlay').appendTo($autoscalerDialog);
$autoscalerDialog.dialog({
title: 'label.autoscale.configuration.wizard',
title: _l('label.autoscale.configuration.wizard'),
width: 825,
height: 600,
draggable: true,