From 0828326898e3bc219c8205e27a3cc942e2790934 Mon Sep 17 00:00:00 2001
From: Michael Gundlach <michael.gundlach@rackspace.com>
Date: Wed, 25 Aug 2010 16:27:01 -0400
Subject: Use compute.instance_types for flavor data instead of a FlavorService

---
 nova/api/rackspace/flavors.py  | 27 +++++++++++++--------------
 nova/compute/instance_types.py | 14 +++++++-------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/nova/api/rackspace/flavors.py b/nova/api/rackspace/flavors.py
index 8c5ffa438..59981f1c5 100644
--- a/nova/api/rackspace/flavors.py
+++ b/nova/api/rackspace/flavors.py
@@ -16,11 +16,11 @@
 #    under the License.
 
 from nova.api.rackspace import base
-from nova.api.rackspace import _id_translator
-from nova import flavor
+from nova.compute import instance_types
 from webob import exc
 
 class Controller(base.Controller):
+    """Flavor controller for the Rackspace API."""
 
     _serialization_metadata = {
         'application/xml': {
@@ -30,21 +30,20 @@ class Controller(base.Controller):
         }
     }
 
-    def __init__(self):
-        self._service = flavor.service.FlavorService.load()
-        self._id_translator = self._id_translator.RackspaceAPIIdTranslator(
-                "flavor", self._service.__class__.__name__)
-
     def index(self, req):
         """Return all flavors."""
-        items = self._service.index()
-        for flavor in items:
-            flavor['id'] = self._id_translator.to_rs_id(flavor['id'])
+        items = [self.show(req, id)['flavor'] for id in self._all_ids()]
         return dict(flavors=items)
 
     def show(self, req, id):
         """Return data about the given flavor id."""
-        opaque_id = self._id_translator.from_rs_id(id)
-        item = self._service.show(opaque_id)
-        item['id'] = id
-        return dict(flavor=item)
+        for name, val in instance_types.INSTANCE_TYPES.iteritems():
+            if val['flavorid'] == int(id):
+                item = dict(ram=val['memory_mb'], disk=val['local_gb'],
+                            id=val['flavorid'], name=name)
+                return dict(flavor=item)
+        raise exc.HTTPNotFound()
+
+    def _all_ids(self):
+        """Return the list of all flavorids."""
+        return [i['flavorid'] for i in instance_types.INSTANCE_TYPES.values()]
diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index 439be3c7d..0102bae54 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -21,10 +21,10 @@
 The built-in instance properties.
 """
 
-INSTANCE_TYPES = {}
-INSTANCE_TYPES['m1.tiny'] = {'memory_mb': 512, 'vcpus': 1, 'local_gb': 0}
-INSTANCE_TYPES['m1.small'] = {'memory_mb': 1024, 'vcpus': 1, 'local_gb': 10}
-INSTANCE_TYPES['m1.medium'] = {'memory_mb': 2048, 'vcpus': 2, 'local_gb': 10}
-INSTANCE_TYPES['m1.large'] = {'memory_mb': 4096, 'vcpus': 4, 'local_gb': 10}
-INSTANCE_TYPES['m1.xlarge'] = {'memory_mb': 8192, 'vcpus': 4, 'local_gb': 10}
-INSTANCE_TYPES['c1.medium'] = {'memory_mb': 2048, 'vcpus': 4, 'local_gb': 10}
+INSTANCE_TYPES = {
+    'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
+    'm1.small': dict(memory_mb=1024, vcpus=1, local_gb=10, flavorid=2),
+    'm1.medium': dict(memory_mb=2048, vcpus=2, local_gb=10, flavorid=3),
+    'm1.large': dict(memory_mb=4096, vcpus=4, local_gb=10, flavorid=4),
+    'm1.xlarge': dict(memory_mb=8192, vcpus=4, local_gb=10, flavorid=5),
+    'c1.medium': dict(memory_mb=2048, vcpus=4, local_gb=10, flavorid=6)}
-- 
cgit