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/29 16:30:41 UTC
git commit: updated refs/heads/master to 4054a8e
Updated Branches:
refs/heads/master 3a3145507 -> 4054a8e2a
CLOUDSTACK-3454: Fix test_portable_publicip
Added isportable param to associateIP API. Fixed base class
for PortableIP tio call portableip APIs.
Removed test_createPortablePublicIPAcquire from basic zone run
requires additional network creation handling which can be done
in component tests.
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/4054a8e2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4054a8e2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4054a8e2
Branch: refs/heads/master
Commit: 4054a8e2ac91eee6cbc0c63094016068bdbe62b8
Parents: 3a31455
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Thu Jul 25 01:52:26 2013 -0400
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Jul 29 20:00:08 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_portable_publicip.py | 8 +++++---
tools/marvin/marvin/integration/lib/base.py | 7 +++++--
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4054a8e2/test/integration/smoke/test_portable_publicip.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_portable_publicip.py b/test/integration/smoke/test_portable_publicip.py
index 9a3a398..73f745c 100644
--- a/test/integration/smoke/test_portable_publicip.py
+++ b/test/integration/smoke/test_portable_publicip.py
@@ -219,7 +219,7 @@ class TestPortablePublicIPAcquire(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags = ["simulator", "basic", "advanced", "portablepublicip"])
+ @attr(tags = ["simulator", "advanced", "portablepublicip"])
def test_createPortablePublicIPAcquire(self):
""" Test to acquire a provisioned public ip range
"""
@@ -229,7 +229,9 @@ class TestPortablePublicIPAcquire(cloudstackTestCase):
self.services
)
- ip_address = PublicIPAddress.create(self.api_client, self.account.name, self.zone.id, self.account.domainid)
+ ip_address = PublicIPAddress.create(self.api_client, self.account.name,
+ self.zone.id, self.account.domainid, True)
+ ip_address.delete(self.api_client)
self.portable_ip_range.delete(self.apiclient)
- return
\ No newline at end of file
+ return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4054a8e2/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 2f834be..b552aba 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -1074,7 +1074,7 @@ class PublicIPAddress:
@classmethod
def create(cls, apiclient, accountid=None, zoneid=None, domainid=None,
- services=None, networkid=None, projectid=None, vpcid=None):
+ isportable=None, services=None, networkid=None, projectid=None, vpcid=None):
"""Associate Public IP address"""
cmd = associateIpAddress.associateIpAddressCmd()
@@ -1093,6 +1093,9 @@ class PublicIPAddress:
elif "domainid" in services:
cmd.domainid = services["domainid"]
+ if isportable:
+ cmd.isportable = isportable
+
if networkid:
cmd.networkid = networkid
@@ -2271,7 +2274,7 @@ class PortablePublicIpRange:
cmd.regionid = services["regionid"]
cmd.vlan = services["vlan"]
- return PortablePublicIpRange(apiclient.createVlanIpRange(cmd).__dict__)
+ return PortablePublicIpRange(apiclient.createPortableIpRange(cmd).__dict__)
def delete(self, apiclient):
"""Delete portable IpRange"""