From db39a060858005a15d55201e72a10069f24ef2f1 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Wed, 30 Nov 2016 18:36:43 +0530 Subject: [PATCH] CLOUDSTACK-9635: fix test_privategw_acl.py ensure VLAN used for createPrivateGateway is determined after the guest networks in the VPC is created, so that we skip VLAN allocated for guest network for the private network of vpc gateway --- test/integration/smoke/test_privategw_acl.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/integration/smoke/test_privategw_acl.py b/test/integration/smoke/test_privategw_acl.py index 1a86175c864..231dd340746 100644 --- a/test/integration/smoke/test_privategw_acl.py +++ b/test/integration/smoke/test_privategw_acl.py @@ -308,6 +308,15 @@ class TestPrivateGwACL(cloudstackTestCase): self.cleanup = [vpc_1, vpc_2, vpc_off, self.account] + network_1 = self.createNetwork(vpc_1, gateway = '10.0.1.1') + network_2 = self.createNetwork(vpc_2, gateway = '10.0.2.1') + + vm1 = self.createVM(network_1) + vm2 = self.createVM(network_2) + + self.cleanup.insert(0, vm1) + self.cleanup.insert(0, vm2) + physical_network = self.get_guest_traffic_physical_network(self.apiclient, self.zone.id) if not physical_network: self.fail("No Physical Networks found!") @@ -319,15 +328,6 @@ class TestPrivateGwACL(cloudstackTestCase): vlans = qresultset vlan_1 = int(vlans[0][0]) - network_1 = self.createNetwork(vpc_1, gateway = '10.0.1.1') - network_2 = self.createNetwork(vpc_2, gateway = '10.0.2.1') - - vm1 = self.createVM(network_1) - vm2 = self.createVM(network_2) - - self.cleanup.insert(0, vm1) - self.cleanup.insert(0, vm2) - acl1 = self.createACL(vpc_1) self.createACLItem(acl1.id, cidr = "0.0.0.0/0") privateGw_1 = self.createPvtGw(vpc_1, "10.0.3.100", "10.0.3.101", acl1.id, vlan_1)