openstack/neutron-tempest-plugin
Code Issues Proposed changes

Merge "Tempest: Fix cleaning of subnets"

Browse Source
This commit is contained in:
Jenkins 2017-09-05 18:50:42 +00:00 committed by Gerrit Code Review
commit 91bee6dcdd
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/tests/tempest/api/base.py
View File

@ -99,6 +99,7 @@ class BaseNetworkTest(test.BaseTestCase):
cls.networks = [] cls.networks = []
cls.admin_networks = [] cls.admin_networks = []
cls.subnets = [] cls.subnets = []
cls.admin_subnets = []
cls.ports = [] cls.ports = []
cls.routers = [] cls.routers = []
cls.floating_ips = [] cls.floating_ips = []
@ -154,6 +155,10 @@ class BaseNetworkTest(test.BaseTestCase):
for subnet in cls.subnets: for subnet in cls.subnets:
cls._try_delete_resource(cls.client.delete_subnet, cls._try_delete_resource(cls.client.delete_subnet,
subnet['id']) subnet['id'])
# Clean up admin subnets
for subnet in cls.admin_subnets:
cls._try_delete_resource(cls.admin_client.delete_subnet,
subnet['id'])
# Clean up networks # Clean up networks
for network in cls.networks: for network in cls.networks:
cls._try_delete_resource(cls.client.delete_network, cls._try_delete_resource(cls.client.delete_network,
@ -308,7 +313,10 @@ class BaseNetworkTest(test.BaseTestCase):
message = 'Available CIDR for subnet creation could not be found' message = 'Available CIDR for subnet creation could not be found'
raise ValueError(message) raise ValueError(message)
subnet = body['subnet'] subnet = body['subnet']
if client is cls.client:
cls.subnets.append(subnet) cls.subnets.append(subnet)
else:
cls.admin_subnets.append(subnet)
return subnet return subnet
@classmethod @classmethod