You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/10/15 10:10:37 UTC
git commit: updated refs/heads/4.2 to 2c6b698
Updated Branches:
refs/heads/4.2 79d702cf9 -> 2c6b698b9
CLOUDSTACK-4256 - Fixed shared network test cases
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 8350a6bd4c982ca0b2f6e45f5f60d923135e49d2)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2c6b698b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2c6b698b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2c6b698b
Branch: refs/heads/4.2
Commit: 2c6b698b97da723be0a3a99b3528d6c6dde14b14
Parents: 79d702c
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Thu Sep 19 01:25:23 2013 -0400
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Tue Oct 15 13:40:10 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_shared_networks.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c6b698b/test/integration/component/test_shared_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_shared_networks.py b/test/integration/component/test_shared_networks.py
index 88bb018..732e144 100644
--- a/test/integration/component/test_shared_networks.py
+++ b/test/integration/component/test_shared_networks.py
@@ -82,10 +82,10 @@ class Services:
"network1": {
"name": "MySharedNetwork - Test1",
"displaytext": "MySharedNetwork1",
- "gateway" :"172.16.15.1",
+ "gateway" :"172.16.16.1",
"netmask" :"255.255.255.0",
- "startip" :"172.16.15.21",
- "endip" :"172.16.15.41",
+ "startip" :"172.16.16.21",
+ "endip" :"172.16.16.41",
"acltype" : "Domain",
"scope":"all",
},
@@ -2189,7 +2189,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.services["network1"]["acltype"] = "domain"
self.services["network1"]["networkofferingid"] = self.shared_network_offering.id
self.services["network1"]["physicalnetworkid"] = physical_network.id
- self.services["network1"]["vlan"] = self.getFreeVlan(self.api_client, self.zone.id)
+ self.services["network1"]["vlan"] = self.getFreeVlan(self.api_client, self.zone.id)[1] #vlan id is second return value of function
self.network1 = Network.create(
self.api_client,