Improve test isolation in test_networks:BulkNetworkOpsTest*
Each test should be using its own networks. The sharing of networks
causes weird, unintended interactions.
Change-Id: Ifef6e9604fb40bba771bf41eea2f08246a803faf
diff --git a/tempest/api/network/test_networks.py b/tempest/api/network/test_networks.py
index ac0fd11..b3f949f 100644
--- a/tempest/api/network/test_networks.py
+++ b/tempest/api/network/test_networks.py
@@ -276,13 +276,6 @@
block defined by tenant-network_cidr
"""
- @classmethod
- @test.safe_setup
- def setUpClass(cls):
- super(BulkNetworkOpsTestJSON, cls).setUpClass()
- cls.network1 = cls.create_network()
- cls.network2 = cls.create_network()
-
def _delete_networks(self, created_networks):
for n in created_networks:
resp, body = self.client.delete_network(n['id'])
@@ -331,11 +324,11 @@
@test.attr(type='smoke')
def test_bulk_create_delete_subnet(self):
+ networks = [self.create_network(), self.create_network()]
# Creates 2 subnets in one request
cidr = netaddr.IPNetwork(CONF.network.tenant_network_cidr)
mask_bits = CONF.network.tenant_network_mask_bits
cidrs = [subnet_cidr for subnet_cidr in cidr.subnet(mask_bits)]
- networks = [self.network1['id'], self.network2['id']]
names = [data_utils.rand_name('subnet-') for i in range(len(networks))]
subnets_list = []
# TODO(raies): "for IPv6, version list [4, 6] will be used.
@@ -343,7 +336,7 @@
ip_version = [4, 4]
for i in range(len(names)):
p1 = {
- 'network_id': networks[i],
+ 'network_id': networks[i]['id'],
'cidr': str(cidrs[(i)]),
'name': names[i],
'ip_version': ip_version[i]
@@ -363,14 +356,14 @@
@test.attr(type='smoke')
def test_bulk_create_delete_port(self):
+ networks = [self.create_network(), self.create_network()]
# Creates 2 ports in one request
- networks = [self.network1['id'], self.network2['id']]
names = [data_utils.rand_name('port-') for i in range(len(networks))]
port_list = []
state = [True, False]
for i in range(len(names)):
p1 = {
- 'network_id': networks[i],
+ 'network_id': networks[i]['id'],
'name': names[i],
'admin_state_up': state[i],
}