Updated Branches: refs/heads/4.2 67c96d419 -> 8be9a4754
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 <t...@apache.org> (cherry picked from commit 4054a8e2ac91eee6cbc0c63094016068bdbe62b8) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8be9a475 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8be9a475 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8be9a475 Branch: refs/heads/4.2 Commit: 8be9a47542e0ae0f481733ac4ddb6476d0e20a18 Parents: 67c96d4 Author: Girish Shilamkar <gir...@clogeny.com> Authored: Thu Jul 25 01:52:26 2013 -0400 Committer: Prasanna Santhanam <t...@apache.org> Committed: Mon Jul 29 20:00:17 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/8be9a475/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/8be9a475/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"""
