simplified instance_types db calls to return entire row - we may need these extra columns for some features and there seems to be little downside in including them. still need to fix testing calls.

2 files changed, 8 insertions, 7 deletions

diff --git a/nova/api/ec2/admin.py b/nova/api/ec2/admin.py
index 5a9e22bf7..4c0628e21 100644
--- a/nova/api/ec2/admin.py
+++ b/nova/api/ec2/admin.py
@@ -84,8 +84,9 @@ class AdminController(object):
         """Returns all active instance types data (vcpus, memory, etc.)"""
         # return {'instanceTypeSet': [instance_dict(n, v) for n, v in
         #                           instance_types.INSTANCE_TYPES.iteritems()]}
-        return {'instanceTypeSet':
-                [for i in db.instance_type_get_all(): instance_dict(i)]}
+        # return {'instanceTypeSet':
+        #         [for i in db.instance_type_get_all(): instance_dict(i)]}
+        return {'instanceTypeSet': [db.instance_type_get_all(_context)]}
 
     # FIXME(kpepple) this is untested code path.
     def describe_instance_type(self, _context, name, **_kwargs):
diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py
index 3124c26b2..9b674afbd 100644
--- a/nova/api/openstack/flavors.py
+++ b/nova/api/openstack/flavors.py
@@ -49,12 +49,12 @@ class Controller(wsgi.Controller):
         """Return data about the given flavor id."""
         # FIXME(kpepple) do we really need admin context here ?
         ctxt = context.get_admin_context()
-        val = db.instance_type_get_by_flavor_id(ctxt, id)
+        values = db.instance_type_get_by_flavor_id(ctxt, id)
         # FIXME(kpepple) refactor db call to return dict
-        v = val.values()[0]
-        item = dict(ram=v['memory_mb'], disk=v['local_gb'],
-                    id=v['flavorid'], name=val.keys()[0])
-        return dict(flavor=item)
+        # v = val.values()[0]
+        # item = dict(ram=v['memory_mb'], disk=v['local_gb'],
+        #             id=v['flavorid'], name=val.keys()[0])
+        return dict(flavor=values)
         raise faults.Fault(exc.HTTPNotFound())
 
     def _all_ids(self):