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/08/02 18:35:47 UTC
git commit: updated refs/heads/4.2 to 33f5bc4
Updated Branches:
refs/heads/4.2 ed08f0f55 -> 33f5bc4bb
make name=value when calling publicipaddress
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 04cc1be58ad4c768709bd975845e8a6e7d1c50ee)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/33f5bc4b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/33f5bc4b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/33f5bc4b
Branch: refs/heads/4.2
Commit: 33f5bc4bb34463a304e29a1584241eccdf2918dd
Parents: ed08f0f
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Aug 2 22:04:51 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Aug 2 22:05:36 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_usage.py | 32 +++++++++++------------
test/integration/component/test_vpn_users.py | 8 +++---
2 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33f5bc4b/test/integration/component/test_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py
index a3779e4..5a42559 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -336,10 +336,10 @@ class TestPublicIPUsage(cloudstackTestCase):
cls.public_ip = PublicIPAddress.create(
cls.api_client,
- cls.virtual_machine.account,
- cls.virtual_machine.zoneid,
- cls.virtual_machine.domainid,
- cls.services["server"]
+ accountid=cls.virtual_machine.account,
+ zoneid=cls.virtual_machine.zoneid,
+ domainid=cls.virtual_machine.domainid,
+ services=cls.services["server"]
)
cls._cleanup = [
cls.service_offering,
@@ -962,10 +962,10 @@ class TestLBRuleUsage(cloudstackTestCase):
)
cls.public_ip_1 = PublicIPAddress.create(
cls.api_client,
- cls.virtual_machine.account,
- cls.virtual_machine.zoneid,
- cls.virtual_machine.domainid,
- cls.services["server"]
+ accountid=cls.virtual_machine.account,
+ zoneid=cls.virtual_machine.zoneid,
+ domainid=cls.virtual_machine.domainid,
+ services=cls.services["server"]
)
cls._cleanup = [
cls.service_offering,
@@ -1291,10 +1291,10 @@ class TestNatRuleUsage(cloudstackTestCase):
)
cls.public_ip_1 = PublicIPAddress.create(
cls.api_client,
- cls.virtual_machine.account,
- cls.virtual_machine.zoneid,
- cls.virtual_machine.domainid,
- cls.services["server"]
+ accountid=cls.virtual_machine.account,
+ zoneid=cls.virtual_machine.zoneid,
+ domainid=cls.virtual_machine.domainid,
+ services=cls.services["server"]
)
cls._cleanup = [
cls.service_offering,
@@ -1454,10 +1454,10 @@ class TestVpnUsage(cloudstackTestCase):
)
cls.public_ip = PublicIPAddress.create(
cls.api_client,
- cls.virtual_machine.account,
- cls.virtual_machine.zoneid,
- cls.virtual_machine.domainid,
- cls.services["server"]
+ accountid=cls.virtual_machine.account,
+ zoneid=cls.virtual_machine.zoneid,
+ domainid=cls.virtual_machine.domainid,
+ services=cls.services["server"]
)
cls._cleanup = [
cls.service_offering,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33f5bc4b/test/integration/component/test_vpn_users.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpn_users.py b/test/integration/component/test_vpn_users.py
index e327624..9ee907b 100644
--- a/test/integration/component/test_vpn_users.py
+++ b/test/integration/component/test_vpn_users.py
@@ -149,10 +149,10 @@ class TestVPNUsers(cloudstackTestCase):
)
self.public_ip = PublicIPAddress.create(
self.apiclient,
- self.virtual_machine.account,
- self.virtual_machine.zoneid,
- self.virtual_machine.domainid,
- self.services["virtual_machine"]
+ accountid=self.virtual_machine.account,
+ zoneid=self.virtual_machine.zoneid,
+ domainid=self.virtual_machine.domainid,
+ services=self.services["virtual_machine"]
)
return
except cloudstackAPIException as e: