You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/30 11:33:37 UTC
git commit: updated refs/heads/master to 2883505
Updated Branches:
refs/heads/master d875a36e5 -> 28835054e
CLOUDSTACK-3921: AssociateIpAddress fails
When you have a method with named parameters, all calls to it should
explicitly pass name=value pairs. Not doing so can result in the wrong
params being passed in the method call. This is a result of the
"services" dictionary being passed into the isportable flag failing the
API signature generation and hence the API call.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/28835054
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/28835054
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/28835054
Branch: refs/heads/master
Commit: 28835054e63432f170c8723a4967d1f480a3c4da
Parents: d875a36
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Tue Jul 30 15:01:34 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Tue Jul 30 15:01:34 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/integration/lib/base.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/28835054/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index b552aba..48c49ab 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -275,14 +275,14 @@ class VirtualMachine:
@return:
"""
public_ip = PublicIPAddress.create(
- apiclient,
- virtual_machine.account,
- virtual_machine.zoneid,
- virtual_machine.domainid,
- services
+ apiclient=apiclient,
+ accountid=virtual_machine.account,
+ zoneid=virtual_machine.zoneid,
+ domainid=virtual_machine.domainid,
+ services=services
)
FireWallRule.create(
- apiclient,
+ apiclient=apiclient,
ipaddressid=public_ip.ipaddress.id,
protocol='TCP',
cidrlist=['0.0.0.0/0'],
@@ -290,9 +290,9 @@ class VirtualMachine:
endport=22
)
nat_rule = NATRule.create(
- apiclient,
- virtual_machine,
- services,
+ apiclient=apiclient,
+ virtual_machine=virtual_machine,
+ services=services,
ipaddressid=public_ip.ipaddress.id
)
virtual_machine.ssh_ip = nat_rule.ipaddress