Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 241E910EDB for ; Fri, 2 Aug 2013 23:47:38 +0000 (UTC) Received: (qmail 31792 invoked by uid 500); 2 Aug 2013 23:47:38 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 31767 invoked by uid 500); 2 Aug 2013 23:47:38 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 31760 invoked by uid 99); 2 Aug 2013 23:47:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Aug 2013 23:47:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B98128B7D30; Fri, 2 Aug 2013 23:47:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yasker@apache.org To: commits@cloudstack.apache.org Message-Id: <70b749a263f348e6a304466e5abaf454@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to b96fea2 Date: Fri, 2 Aug 2013 23:47:37 +0000 (UTC) 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 Authored: Fri Aug 2 16:45:40 2013 -0700 Committer: Sheng Yang 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(