BUG-ID: CS-19426: UI > VPC > VM Wizard > change to send ipToNetworkList parameter instead of networkIds parameter to deployVM API. Reviewed-by: Brian
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d71483f7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d71483f7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d71483f7 Branch: refs/heads/rbac Commit: d71483f7718922624273e60d920010fa268549fb Parents: f032637 Author: Jessica Wang <jessicaw...@apache.org> Authored: Mon Mar 3 11:44:10 2014 -0800 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Mon Mar 3 11:49:42 2014 -0800 ---------------------------------------------------------------------- ui/scripts/instanceWizard.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d71483f7/ui/scripts/instanceWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js index c447b31..3ee9af1 100644 --- a/ui/scripts/instanceWizard.js +++ b/ui/scripts/instanceWizard.js @@ -817,10 +817,12 @@ }); } } else if (step6ContainerType == 'nothing-to-select') { - if (args.context.networks != null) { //from VPC tier - $.extend(deployVmData, { - networkids : args.context.networks[0].id - }); + if ("vpc" in args.context) { //from VPC tier + deployVmData["iptonetworklist[0].networkid"] = args.context.networks[0].id; + if (args.data["vpc-specify-ip"] != undefined && args.data["vpc-specify-ip"].length > 0) { + deployVmData["iptonetworklist[0].ip"] = args.data["vpc-specify-ip"]; + } + $.extend(deployVmData, { domainid : args.context.vpc[0].domainid });
