Updated Branches: refs/heads/master-6-17-stable 12d7a3dfb -> 3778ae101
CLOUDSTACK-3165: UI > VPC page - Configure VPC chart - pass associatednetworkid instead of networkid to listPublicIpAddresses API. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3778ae10 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3778ae10 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3778ae10 Branch: refs/heads/master-6-17-stable Commit: 3778ae1012de63fea40e764e89f905567f1305ad Parents: 12d7a3d Author: Jessica Wang <jessicaw...@apache.org> Authored: Tue Jun 25 11:36:34 2013 -0700 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Tue Jun 25 11:44:53 2013 -0700 ---------------------------------------------------------------------- ui/scripts/vpc.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3778ae10/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 773409f..ed07a2c 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -831,7 +831,7 @@ $.ajax({ url: createURL('listPublicIpAddresses'), async: false, - data: { networkid: args.context.networks[0].id, forloadbalancing: true }, + data: { associatednetworkid: args.context.networks[0].id, forloadbalancing: true }, success: function(json) { var items = json.listpublicipaddressesresponse; args.response.success({ data: items }); @@ -1398,7 +1398,7 @@ $.ajax({ url: createURL('listPublicIpAddresses'), data: { - networkid: args.context.networks[0].id, + associatednetworkid: args.context.networks[0].id, isstaticnat: true, listall: true }, @@ -3503,8 +3503,8 @@ url: createURL('listPublicIpAddresses'), async: false, data: { - vpcid: args.context.vpc[0].id, - listAll: true + vpcid: args.context.vpc[0].id, + listAll: true }, success: function(json) { publicIpAddresses = json.listpublicipaddressesresponse; @@ -3583,7 +3583,7 @@ $.ajax({ url: createURL('listPublicIpAddresses&listAll=true'), async: false, - data: { networkid: tier.id, forloadbalancing: true }, + data: { associatednetworkid: tier.id, forloadbalancing: true }, success: function(json) { publicLbIps = json.listpublicipaddressesresponse; }, @@ -3596,7 +3596,7 @@ $.ajax({ url: createURL('listPublicIpAddresses&listAll=true'), async: false, - data: { networkid: tier.id, isstaticnat: true }, + data: { associatednetworkid: tier.id, isstaticnat: true }, success: function(json) { staticNatIps = json.listpublicipaddressesresponse; },
