commit a5a9c50a6a56b7db52eb31f1dc98656ccd22ec85
author Jenkins <jenkins@review.openstack.org> Mon Jan 05 08:28:17 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jan 05 08:28:17 2015 +0000
tree f9a62a6acb3f3d976d0b87a5af7d53e9800bf50c
parent ce13c96c5d0eeaabe95293672a9a8c7e245cc7fd
parent 0690ea4d7fc70a025ece5416caef3cfc4aa3422e

Merge "Remove _get_endpoint_type() from RestClient"

requirements.txt

diff --git a/requirements.txt b/requirements.txt
index f9d8036..a6e7dd1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@
 paramiko>=1.13.0
 netaddr>=0.7.12
 python-ceilometerclient>=1.0.6
-python-glanceclient>=0.14.0
+python-glanceclient>=0.15.0
 python-keystoneclient>=0.11.1
 python-novaclient>=2.18.0
 python-neutronclient>=2.3.6,<3

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