commit ce13c96c5d0eeaabe95293672a9a8c7e245cc7fd
author Jenkins <jenkins@review.openstack.org> Mon Jan 05 08:21:20 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jan 05 08:21:20 2015 +0000
tree e493e18d3ad060d8a37b532b0b38baa9039d27b1
parent 3f99d77ad158bfb89f12a0be4fc339b038aeaa04
parent f37eaef44f2514b0bb33ce8a2f620d7958865b76

Merge "Ignore router_interface is not found while cleanup"

tempest/api/network/base.py

diff --git a/tempest/api/network/base.py b/tempest/api/network/base.py
index 12b2d13..10cda53 100644
--- a/tempest/api/network/base.py
+++ b/tempest/api/network/base.py
@@ -396,8 +396,11 @@
         body = cls.client.list_router_interfaces(router['id'])
         interfaces = body['ports']
         for i in interfaces:
-            cls.client.remove_router_interface_with_subnet_id(
-                router['id'], i['fixed_ips'][0]['subnet_id'])
+            try:
+                cls.client.remove_router_interface_with_subnet_id(
+                    router['id'], i['fixed_ips'][0]['subnet_id'])
+            except exceptions.NotFound:
+                pass
         cls.client.delete_router(router['id'])
 
     @classmethod