openstack
/
neutron-tempest-plugin
Code Issues Proposed changes

Merge "Ensure that external network don't have any ports before deletion"

This commit is contained in:
Zuul 2020-04-29 10:16:14 +00:00 committed by Gerrit Code Review
parent e08fc09f6b 03700aa12b
commit 4bc1b00213
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron_tempest_plugin/api/admin/test_external_network_extension.py
View File

@ -35,9 +35,18 @@ class ExternalNetworksRBACTestJSON(base.BaseAdminNetworkTest):
post_body['router:external'] = external
body = self.admin_client.create_network(**post_body)
network = body['network']
self.addCleanup(self.admin_client.delete_network, network['id'])
self.addCleanup(self._delete_network, network['id'])
return network
def _delete_network(self, net_id):
try:
self.admin_client.delete_network(net_id)
except lib_exc.Conflict:
ports = self.admin_client.list_ports(network_id=net_id)['ports']
for port in ports:
self.admin_client.delete_port(port['id'])
self.admin_client.delete_network(net_id)
@decorators.idempotent_id('afd8f1b7-a81e-4629-bca8-a367b3a144bb')
def test_regular_client_shares_with_another(self):
net = self.create_network()