cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/4.2 to 6e83a54
Date Fri, 02 Aug 2013 11:04:56 GMT
Updated Branches:
  refs/heads/4.2 fd9cf9743 -> 6e83a54ff


CLOUDSTACK-3753 fixed the test test_non_contigiousvlan.py

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


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

Branch: refs/heads/4.2
Commit: 6e83a54ffbf69e46a79fbaf0be63e63092385b65
Parents: fd9cf97
Author: Bharat Kumar <bharat.kumar@citrix.com>
Authored: Fri Aug 2 16:19:28 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Fri Aug 2 16:28:44 2013 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_non_contigiousvlan.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e83a54f/test/integration/smoke/test_non_contigiousvlan.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_non_contigiousvlan.py b/test/integration/smoke/test_non_contigiousvlan.py
index 5fdc034..f1736ae 100644
--- a/test/integration/smoke/test_non_contigiousvlan.py
+++ b/test/integration/smoke/test_non_contigiousvlan.py
@@ -52,13 +52,14 @@ class TestUpdatePhysicalNetwork(cloudstackTestCase):
 
         self.network = phy_networks[0]
         self.networkid = phy_networks[0].id
-        vlan1 = self.vlan["part"][0]
+        self.existing_vlan = phy_networks[0].vlan
+        vlan1 = self.existing_vlan+","+self.vlan["part"][0]
         updatePhysicalNetworkResponse = self.network.update(self.apiClient, id = self.networkid,
vlan = vlan1)
         self.assert_(updatePhysicalNetworkResponse is not None,
             msg="couldn't extend the physical network with vlan %s"%vlan1)
         self.assert_(isinstance(self.network, PhysicalNetwork))
 
-        vlan2 = self.vlan["part"][1]
+        vlan2 = vlan1+","+self.vlan["part"][1]
         updatePhysicalNetworkResponse2 = self.network.update(self.apiClient, id = self.networkid,
vlan = vlan2)
         self.assert_(updatePhysicalNetworkResponse2 is not None,
             msg="couldn't extend the physical network with vlan %s"%vlan2)
@@ -80,7 +81,7 @@ class TestUpdatePhysicalNetwork(cloudstackTestCase):
             msg="There are no physical networks in the zone")
         self.network = phy_networks[0]
         self.networkid = phy_networks[0].id
-        updateResponse = self.network.update(self.apiClient, id = self.networkid, removevlan
= self.vlan["full"])
+        updateResponse = self.network.update(self.apiClient, id = self.networkid, vlan=self.existing_vlan)
         self.assert_(updateResponse.vlan.find(self.vlan["full"]) < 0,
             "VLAN was not removed successfully")
 


Mime
View raw message