added FIXME(kpepple) comments for all constant usage of INSTANCE_TYPES. updated api/ec2/admin.py to use the new instance_types db table

2 files changed, 16 insertions, 7 deletions

diff --git a/nova/api/ec2/admin.py b/nova/api/ec2/admin.py
index 55cca1041..5a9e22bf7 100644
--- a/nova/api/ec2/admin.py
+++ b/nova/api/ec2/admin.py
@@ -63,8 +63,8 @@ def host_dict(host):
         return {}
 
 
-def instance_dict(name, inst):
-    return {'name': name,
+def instance_dict(inst):
+    return {'name': inst['name'],
             'memory_mb': inst['memory_mb'],
             'vcpus': inst['vcpus'],
             'disk_gb': inst['local_gb'],
@@ -79,10 +79,19 @@ class AdminController(object):
     def __str__(self):
         return 'AdminController'
 
-    # FIX-ME(kpepple) for dynamic flavors
+    # FIXME(kpepple) this is untested code path.
     def describe_instance_types(self, _context, **_kwargs):
-        return {'instanceTypeSet': [instance_dict(n, v) for n, v in
-                                    instance_types.INSTANCE_TYPES.iteritems()]}
+        """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)]}
+
+    # FIXME(kpepple) this is untested code path.
+    def describe_instance_type(self, _context, name, **_kwargs):
+        """Returns a specific active instance types data"""
+        return {'instanceTypeSet':
+                [instance_dict(db.instance_type_get_by_name(name))]}
 
     def describe_user(self, _context, name, **_kwargs):
         """Returns user data, including access and secret keys."""
diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py
index 1f5185134..2416088f9 100644
--- a/nova/api/openstack/flavors.py
+++ b/nova/api/openstack/flavors.py
@@ -45,7 +45,7 @@ class Controller(wsgi.Controller):
 
     def show(self, req, id):
         """Return data about the given flavor id."""
-        # FIX-ME(kpepple) for dynamic flavors
+        # FIXME(kpepple) for dynamic flavors
         for name, val in instance_types.INSTANCE_TYPES.iteritems():
             if val['flavorid'] == int(id):
                 item = dict(ram=val['memory_mb'], disk=val['local_gb'],
@@ -55,5 +55,5 @@ class Controller(wsgi.Controller):
 
     def _all_ids(self):
         """Return the list of all flavorids."""
-        # FIX-ME(kpepple) for dynamic flavors
+        # FIXME(kpepple) for dynamic flavors
         return [i['flavorid'] for i in instance_types.INSTANCE_TYPES.values()]