Merge "Handle network api failures more gracefully"

1 files changed, 11 insertions, 0 deletions

diff --git a/nova/tests/api/openstack/test_common.py b/nova/tests/api/openstack/test_common.py
index e8f967976..6103b6d13 100644
--- a/nova/tests/api/openstack/test_common.py
+++ b/nova/tests/api/openstack/test_common.py
@@ -26,6 +26,7 @@ from webob import Request
 import xml.dom.minidom as minidom
 
 from nova import exception
+from nova import network
 from nova import test
 from nova.api.openstack import common
 from nova.api.openstack import xmlutil
@@ -328,6 +329,16 @@ class MiscFunctionsTest(test.TestCase):
         else:
             self.fail("webob.exc.HTTPConflict was not raised")
 
+    def test_get_networks_for_instance_handles_instance_not_found(self):
+
+        def raise_not_found(*args, **kwargs):
+            raise exception.InstanceNotFound(instance_id='abcd')
+
+        self.stubs.Set(network.API, 'get_instance_nw_info', raise_not_found)
+
+        networks = common.get_networks_for_instance(context={}, instance={})
+        self.assertEqual(networks, {})
+
 
 class MetadataXMLDeserializationTest(test.TestCase):