You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2012/08/02 01:11:10 UTC
git commit: CS-15792: cloudstack 3.0 UI - VPC - pass domainid+account
instead of listAll to all listNetworks API calls under VPC section.
Updated Branches:
refs/heads/vpc babc868de -> a90244370
CS-15792: cloudstack 3.0 UI - VPC - pass domainid+account instead of listAll to all listNetworks API calls under VPC section.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a9024437
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a9024437
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a9024437
Branch: refs/heads/vpc
Commit: a902443708ee10acb9f68fff74af346a6a9fb370
Parents: babc868
Author: Jessica Wang <je...@citrix.com>
Authored: Wed Aug 1 16:10:04 2012 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Wed Aug 1 16:10:41 2012 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 18 ++++++++++++------
ui/scripts/vpc.js | 4 +++-
2 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a9024437/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 156443f..e6fba21 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1383,8 +1383,10 @@
async: false,
data: {
vpcid: args.context.vpc[0].id,
- listAll: true,
- supportedservices: 'StaticNat'
+ //listAll: true, //do not pass listAll to listNetworks under VPC
+ domainid: args.context.vpc[0].domainid,
+ account: args.context.vpc[0].account,
+ supportedservices: 'StaticNat'
},
success: function(json) {
var networks = json.listnetworksresponse.network;
@@ -2208,12 +2210,14 @@
select: function(args) {
if('vpc' in args.context) {
var data = {
- listAll: true,
+ //listAll: true, //do not pass listAll to listNetworks under VPC
supportedservices: 'Lb'
};
if(args.context.ipAddresses[0].associatednetworkid == null) {
$.extend(data, {
- vpcid: args.context.vpc[0].id
+ vpcid: args.context.vpc[0].id,
+ domainid: args.context.vpc[0].domainid,
+ account: args.context.vpc[0].account
});
}
else {
@@ -2615,12 +2619,14 @@
select: function(args) {
if('vpc' in args.context) {
var data = {
- listAll: true,
+ //listAll: true, //do not pass listAll to listNetworks under VPC
supportedservices: 'PortForwarding'
};
if(args.context.ipAddresses[0].associatednetworkid == null) {
$.extend(data, {
- vpcid: args.context.vpc[0].id
+ vpcid: args.context.vpc[0].id,
+ domainid: args.context.vpc[0].domainid,
+ account: args.context.vpc[0].account
});
}
else {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a9024437/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 03c1810..31b0dc8 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -1900,7 +1900,9 @@
dataType: "json",
data: {
vpcid: args.context.vpc[0].id,
- listAll: true
+ //listAll: true, //do not pass listAll to listNetworks under VPC
+ domainid: args.context.vpc[0].domainid,
+ account: args.context.vpc[0].account
},
async: true,
success: function(json) {