Make flavorextradata ignore deleted flavors.

In _get_flavor_refs, don't retrieve inactive flavors. Fixes bug 1026210. This change was made on trunk in https://review.openstack.org/#/c/9995/ Change-Id: I967faa661cd4177a54079a966ca8912923c5f61b
openstack · Aug 8, 2012 · 2f35f8e · 2f35f8e
1 parent d4c7f6f
commit 2f35f8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Authors b/Authors
@@ -43,6 +43,7 @@ Dan Wendlandt <dan@nicira.com>
 Daniel P. Berrange <berrange@redhat.com>
 Dave Lapsley <dlapsley@nicira.com>
 Dave Walker <Dave.Walker@canonical.com>
+David Besen <david.besen@hp.com>
 David McNally <dave.mcnally@hp.com>
 David Pravec <David.Pravec@danix.org>
 David Subiros <david.perez5@hp.com>

diff --git a/nova/api/openstack/compute/contrib/flavorextradata.py b/nova/api/openstack/compute/contrib/flavorextradata.py
@@ -37,7 +37,7 @@
 class FlavorextradataController(wsgi.Controller):
     def _get_flavor_refs(self):
         """Return a dictionary mapping flavorid to flavor_ref."""
-        flavor_refs = instance_types.get_all_types(True)
+        flavor_refs = instance_types.get_all_types()
         rval = {}
         for name, obj in flavor_refs.iteritems():
             rval[obj['flavorid']] = obj