cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject git commit: updated refs/heads/master to b96fea2
Date Fri, 02 Aug 2013 23:47:37 GMT
Updated Branches:
  refs/heads/master cd28e4f37 -> b96fea2e0


Automation: BVT: Fix test_guest_vlan_range.py due to updated API


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

Branch: refs/heads/master
Commit: b96fea2e065c2c1ef5f6c3b738d0056ca14eb52c
Parents: cd28e4f
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Fri Aug 2 16:45:40 2013 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Fri Aug 2 16:47:32 2013 -0700

----------------------------------------------------------------------
 test/integration/smoke/test_guest_vlan_range.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b96fea2e/test/integration/smoke/test_guest_vlan_range.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_guest_vlan_range.py b/test/integration/smoke/test_guest_vlan_range.py
index a99ad99..8ea4719 100644
--- a/test/integration/smoke/test_guest_vlan_range.py
+++ b/test/integration/smoke/test_guest_vlan_range.py
@@ -68,6 +68,11 @@ class TestDedicateGuestVlanRange(cloudstackTestCase):
         cls._cleanup = [
                         cls.account,
                         ]
+
+        phy_networks = PhysicalNetwork.list(
+                             cls.api_client
+                             )
+        cls.existed_vlan = phy_networks[0].vlan
         return
 
     @classmethod
@@ -80,7 +85,7 @@ class TestDedicateGuestVlanRange(cloudstackTestCase):
                 removeGuestVlanRangeResponse = \
                 physical_network.update(cls.api_client,
                         id=physical_network.id,
-                        removevlan=cls.services["vlan"])
+                        vlan=cls.existed_vlan)
             cleanup_resources(cls.api_client, cls._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -128,7 +133,10 @@ class TestDedicateGuestVlanRange(cloudstackTestCase):
         physical_network_response = list_physical_network_response[0]
 
         self.debug("Adding guest vlan range")
-        addGuestVlanRangeResponse = physical_network_response.update(self.apiclient, id=physical_network_response.id,
vlan=self.services["vlan"])
+
+        new_vlan = self.existed_vlan + "," + self.services["vlan"]
+        addGuestVlanRangeResponse = physical_network_response.update(self.apiclient,
+                id=physical_network_response.id, vlan=new_vlan)
 
         self.debug("Dedicating guest vlan range");
         dedicate_guest_vlan_range_response = PhysicalNetwork.dedicate(


Mime
View raw message