Updated Branches: refs/heads/4.2 b1462e826 -> f0df405b8
CLOUDSTACK-5351: Fixed a regression where shared_ntwk_vlan was not changed to shared_vlan Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f0df405b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f0df405b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f0df405b Branch: refs/heads/4.2 Commit: f0df405b8facefdc18ef270bd5d6d390ea8941c5 Parents: b1462e8 Author: Girish Shilamkar <[email protected]> Authored: Wed Dec 4 18:54:50 2013 +0530 Committer: Girish Shilamkar <[email protected]> Committed: Wed Dec 4 18:57:29 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_shared_networks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0df405b/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 9b76702..99cce19 100644 --- a/test/integration/component/test_shared_networks.py +++ b/test/integration/component/test_shared_networks.py @@ -1992,8 +1992,8 @@ class TestSharedNetworks(cloudstackTestCase): self.services["network"]["acltype"] = "Domain" self.services["network"]["networkofferingid"] = self.shared_network_offering.id self.services["network"]["physicalnetworkid"] = physical_network.id - self.services["network"]["vlan"] = shared_ntwk_vlan - self.debug("Creating a shared network in non-cloudstack VLAN %s" % shared_ntwk_vlan) + self.services["network"]["vlan"] = shared_vlan + self.debug("Creating a shared network in non-cloudstack VLAN %s" % shared_vlan) self.network = Network.create( self.api_client, self.services["network"],
