cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject [41/50] [abbrv] git commit: updated refs/heads/master to d22adf9
Date Wed, 23 Apr 2014 06:17:53 GMT
CLOUDSTACK-5674: Fix issues with BVT


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8df1c71b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8df1c71b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8df1c71b

Branch: refs/heads/master
Commit: 8df1c71b6d1869ad6d7f90c3074009c2a666034a
Parents: b83407f
Author: Girish Shilamkar <girish@clogeny.com>
Authored: Wed Apr 9 21:17:01 2014 +0530
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Wed Apr 9 21:17:01 2014 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_public_ip_range.py | 2 --
 tools/marvin/marvin/lib/base.py                | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8df1c71b/test/integration/smoke/test_public_ip_range.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_public_ip_range.py b/test/integration/smoke/test_public_ip_range.py
index 33d8591..0355325 100644
--- a/test/integration/smoke/test_public_ip_range.py
+++ b/test/integration/smoke/test_public_ip_range.py
@@ -37,8 +37,6 @@ class TestDedicatePublicIPRange(cloudstackTestCase):
         cls.domain = get_domain(cls.apiclient)
         cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
         cls.services["zoneid"] = cls.zone.id
-        pod = get_pod(cls.apiclient, cls.zone.id)
-        cls.services["podid"] = pod.id
         # Create Account
         cls.account = Account.create(
                             cls.apiclient,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8df1c71b/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index dc35f9c..26f920e 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -2428,7 +2428,8 @@ class PublicIpRange:
         cmd.startip = services["startip"]
         cmd.endip = services["endip"]
         cmd.zoneid = services["zoneid"]
-        cmd.podid = services["podid"]
+        if "podid" in services:
+            cmd.podid = services["podid"]
         cmd.vlan = services["vlan"]
 
         return PublicIpRange(apiclient.createVlanIpRange(cmd).__dict__)


Mime
View raw message