openstack
/
tempest
Code Issues Proposed changes

Merge "Improve router deletion logging in tempest cleanup"

This commit is contained in:
Zuul 2019-04-08 22:05:42 +00:00 committed by Gerrit Code Review
parent 13bbcdd6bf 598b1ae854
commit e1bc201c57
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tempest/cmd/cleanup_service.py
View File

@ -471,12 +471,16 @@ class NetworkRouterService(BaseNetworkService):
routers = self.list()
for router in routers:
rid = router['id']
try:
ports = [port for port
in ports_client.list_ports(device_id=rid)['ports']
if net_info.is_router_interface_port(port)]
for port in ports:
ports = [port for port
in ports_client.list_ports(device_id=rid)['ports']
if net_info.is_router_interface_port(port)]
for port in ports:
try:
client.remove_router_interface(rid, port_id=port['id'])
except Exception:
LOG.exception("Delete Router Interface exception for "
"'port %s' of 'router %s'.", port['id'], rid)
try:
client.delete_router(rid)
except Exception:
LOG.exception("Delete Router %s exception.", rid)