Handle FlavorNotFound on server list w/ filter

Fix bug 919426

Change-Id: I1f450fd7ed28837b664aa81f4dd833e3433cd126

2 files changed, 16 insertions, 6 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 9cc9744b8..9b6896273 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1003,8 +1003,12 @@ class API(base.Base):
         filters = {}
 
         def _remap_flavor_filter(flavor_id):
-            instance_type = instance_types.get_instance_type_by_flavor_id(
-                    flavor_id)
+            try:
+                instance_type = instance_types.get_instance_type_by_flavor_id(
+                        flavor_id)
+            except exception.FlavorNotFound:
+                raise ValueError()
+
             filters['instance_type_id'] = instance_type['id']
 
         def _remap_fixed_ip_filter(fixed_ip):
@@ -1037,7 +1041,13 @@ class API(base.Base):
                 if isinstance(remap_object, basestring):
                     filters[remap_object] = value
                 else:
-                    remap_object(value)
+                    try:
+                        remap_object(value)
+
+                    # We already know we can't match the filter, so
+                    # return an empty list
+                    except ValueError:
+                        return []
 
         local_zone_only = search_opts.get('local_zone_only', False)
 
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 992b1076f..421a0ef89 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -2469,9 +2469,9 @@ class ComputeAPITestCase(BaseTestCase):
                 search_opts={'flavor': 5})
         self.assertEqual(len(instances), 0)
 
-        self.assertRaises(exception.FlavorNotFound,
-                self.compute_api.get_all,
-                c, search_opts={'flavor': 99})
+        # ensure unknown filter maps to an empty list, not an exception
+        instances = self.compute_api.get_all(c, search_opts={'flavor': 99})
+        self.assertEqual(instances, [])
 
         instances = self.compute_api.get_all(c, search_opts={'flavor': 3})
         self.assertEqual(len(instances), 1)