Updated Branches: refs/heads/4.2 cf220dd63 -> 7522f8116
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/7522f811 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7522f811 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7522f811 Branch: refs/heads/4.2 Commit: 7522f811672f66bc0cc13a33f4f3737ef03f22af Parents: cf220dd Author: Sheng Yang <[email protected]> Authored: Fri Aug 2 16:45:40 2013 -0700 Committer: Sheng Yang <[email protected]> Committed: Fri Aug 2 16:45:40 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/7522f811/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(
