openstack/tempest
Code Issues Proposed changes

Merge "Fix auto allocate network cleanup"

Browse Source
This commit is contained in:
Jenkins 2017-07-05 07:37:29 +00:00 committed by Gerrit Code Review
commit 20c0ade60f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tempest/api/compute/admin/test_auto_allocate_network.py
View File

@ -111,10 +111,12 @@ class AutoAllocateNetworkTest(base.BaseV2ComputeTest):
LOG.info('(%s) Found more than one router for tenant.',
test_utils.find_test_caller())
# Let's just blindly remove any networks, duplicate or otherwise, that
# the test might have created even though Neutron will cleanup
# duplicate resources automatically (so ignore 404s).
networks = cls.networks_client.list_networks().get('networks', [])
# Remove any networks, duplicate or otherwise, that these tests
# created. All such networks will be in the current tenant. Neutron
# will cleanup duplicate resources automatically, so ignore 404s.
search_opts = {'tenant_id': cls.networks_client.tenant_id}
networks = cls.networks_client.list_networks(
**search_opts).get('networks', [])
for router in routers:
# Disassociate the subnets from the router. Because of the race