Fixed the case where an exception was thrown when trying to get a list of flavors via the api yet there were no flavors to list.

hand tested :)

1 files changed, 2 insertions, 4 deletions

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index c08d3dbb5..ffd009513 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2944,13 +2944,11 @@ def instance_type_get_all(context, inactive=False):
                         filter_by(deleted=False).\
                         order_by("name").\
                         all()
+    inst_dict = {}
     if inst_types:
-        inst_dict = {}
         for i in inst_types:
             inst_dict[i['name']] = _dict_with_extra_specs(i)
-        return inst_dict
-    else:
-        raise exception.NoInstanceTypesFound()
+    return inst_dict
 
 
 @require_context