From 77a48cdd8a22cc84ed67a6b3d1c3793dd93e44a8 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Wed, 16 Mar 2011 16:15:56 -0400
Subject: expanding osapi flavors tests; rewriting flavors resource with view
 builders; adding 1.1 specific links to flavors resources

---
 nova/api/openstack/flavors.py            |  48 +++++++-------
 nova/api/openstack/views/flavors.py      |  45 ++++++++++++-
 nova/db/sqlalchemy/api.py                |   2 +-
 nova/tests/api/openstack/test_flavors.py | 107 +++++++++++++++++++++++++++++--
 4 files changed, 167 insertions(+), 35 deletions(-)

diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py
index c99b945fb..bc61e8d1a 100644
--- a/nova/api/openstack/flavors.py
+++ b/nova/api/openstack/flavors.py
@@ -15,16 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from webob import exc
+import webob
 
 from nova import db
-from nova import context
-from nova.api.openstack import faults
-from nova.api.openstack import common
-from nova.compute import instance_types
-from nova.api.openstack.views import flavors as flavors_views
+from nova import exception
 from nova import wsgi
-import nova.api.openstack
+from nova.api.openstack.views import flavors as flavors_views
 
 
 class Controller(wsgi.Controller):
@@ -37,29 +33,31 @@ class Controller(wsgi.Controller):
 
     def index(self, req):
         """Return all flavors in brief."""
-        return dict(flavors=[dict(id=flavor['id'], name=flavor['name'])
-                             for flavor in self.detail(req)['flavors']])
+        items = self._get_flavors(req, False)
+        return dict(flavors=items)
 
     def detail(self, req):
         """Return all flavors in detail."""
-        items = [self.show(req, id)['flavor'] for id in self._all_ids(req)]
+        items = self._get_flavors(req, True)
         return dict(flavors=items)
 
+    def _get_flavors(self, req, is_detail):
+        """Helper function that returns a list of flavor dicts."""
+        ctxt = req.environ['nova.context']
+        flavors = db.api.instance_type_get_all(ctxt)
+        builder = flavors_views.get_view_builder(req)
+        items = [builder.build(flavor, is_detail=is_detail) \
+                 for flavor in flavors.values()]
+        return items
+
     def show(self, req, id):
         """Return data about the given flavor id."""
-        ctxt = req.environ['nova.context']
-        flavor = db.api.instance_type_get_by_flavor_id(ctxt, id)
-        values = {
-            "id": flavor["flavorid"],
-            "name": flavor["name"],
-            "ram": flavor["memory_mb"],
-            "disk": flavor["local_gb"],
-        }
+        try:
+            ctxt = req.environ['nova.context']
+            flavor = db.api.instance_type_get_by_flavor_id(ctxt, id)
+        except exception.NotFound:
+            return webob.exc.HTTPNotFound()
+
+        builder = flavors_views.get_view_builder(req)
+        values = builder.build(flavor, is_detail=True)
         return dict(flavor=values)
-
-    def _all_ids(self, req):
-        """Return the list of all flavorids."""
-        ctxt = req.environ['nova.context']
-        inst_types = db.api.instance_type_get_all(ctxt)
-        flavor_ids = [inst_types[i]['flavorid'] for i in inst_types.keys()]
-        return sorted(flavor_ids)
diff --git a/nova/api/openstack/views/flavors.py b/nova/api/openstack/views/flavors.py
index dd2e75a7a..19ac8f114 100644
--- a/nova/api/openstack/views/flavors.py
+++ b/nova/api/openstack/views/flavors.py
@@ -35,14 +35,55 @@ class ViewBuilder(object):
     def __init__(self):
         pass
 
-    def build(self, flavor_obj):
-        raise NotImplementedError()
+    def build(self, flavor_obj, is_detail=False):
+        if is_detail:
+            flavor = self._build_detail(flavor_obj)
+        else:
+            flavor = self._build_simple(flavor_obj)
+
+        full_flavor = self._build_extra(flavor)
+
+        return full_flavor
+
+    def _build_simple(self, flavor_obj):
+        return {
+            "id": flavor_obj["flavorid"],
+            "name": flavor_obj["name"],
+        }
+
+    def _build_detail(self, flavor_obj):
+        simple = self._build_simple(flavor_obj)
+
+        detail = {
+            "ram": flavor_obj["memory_mb"],
+            "disk": flavor_obj["local_gb"],
+        }
+
+        detail.update(simple)
+
+        return detail 
+    
+    def _build_extra(self, flavor_obj):
+        return flavor_obj
 
 
 class ViewBuilder_1_1(ViewBuilder):
     def __init__(self, base_url):
         self.base_url = base_url
 
+    def _build_extra(self, flavor_obj):
+        flavor_obj["links"] = self._build_links(flavor_obj)
+        return flavor_obj
+
+    def _build_links(self, flavor_obj):
+        links = [
+            {
+                "rel": "self",
+                "href": self.generate_href(flavor_obj["id"]),
+            },
+        ]
+        return links
+
     def generate_href(self, flavor_id):
         return "%s/flavors/%s" % (self.base_url, flavor_id)
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 56998ce05..6789ac22a 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2356,7 +2356,7 @@ def instance_type_get_by_flavor_id(context, id):
                                     filter_by(flavorid=int(id)).\
                                     first()
     if not inst_type:
-        raise exception.NotFound(_("No flavor with name %s") % id)
+        raise exception.NotFound(_("No flavor with flavorid %s") % id)
     else:
         return dict(inst_type)
 
diff --git a/nova/tests/api/openstack/test_flavors.py b/nova/tests/api/openstack/test_flavors.py
index 4f504808c..197e907c4 100644
--- a/nova/tests/api/openstack/test_flavors.py
+++ b/nova/tests/api/openstack/test_flavors.py
@@ -19,11 +19,10 @@ import json
 import stubout
 import webob
 
-from nova import test
-import nova.api
+import nova.db.api
 from nova import context
-from nova.api.openstack import flavors
-from nova import db
+from nova import exception
+from nova import test
 from nova.tests.api.openstack import fakes
 
 
@@ -47,6 +46,9 @@ def return_instance_types(context, num=2):
         instance_types[name] = stub_flavor(i, name)
     return instance_types
 
+def return_instance_type_not_found(context, flavorid):
+    raise exception.NotFound()
+
 
 class FlavorsTest(test.TestCase):
     def setUp(self):
@@ -67,7 +69,7 @@ class FlavorsTest(test.TestCase):
         self.stubs.UnsetAll()
         super(FlavorsTest, self).tearDown()
 
-    def test_get_flavor_list(self):
+    def test_get_flavor_list_v1_0(self):
         req = webob.Request.blank('/v1.0/flavors')
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
@@ -84,7 +86,7 @@ class FlavorsTest(test.TestCase):
         ]
         self.assertEqual(flavors, expected)
 
-    def test_get_flavor_list_detail(self):
+    def test_get_flavor_list_detail_v1_0(self):
         req = webob.Request.blank('/v1.0/flavors/detail')
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
@@ -105,7 +107,7 @@ class FlavorsTest(test.TestCase):
         ]
         self.assertEqual(flavors, expected)
 
-    def test_get_flavor_by_id(self):
+    def test_get_flavor_by_id_v1_0(self):
         req = webob.Request.blank('/v1.0/flavors/12')
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
@@ -117,3 +119,94 @@ class FlavorsTest(test.TestCase):
             "disk": "10",
         }
         self.assertEqual(flavor, expected)
+
+    def test_get_flavor_by_invalid_id(self):
+        self.stubs.Set(nova.db.api, "instance_type_get_by_flavor_id",
+                       return_instance_type_not_found)
+        req = webob.Request.blank('/v1.0/flavors/asdf')
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 404)
+
+    def test_get_flavor_by_id_v1_1(self):
+        req = webob.Request.blank('/v1.1/flavors/12')
+        req.environ['api.version'] = '1.1'
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 200)
+        flavor = json.loads(res.body)["flavor"]
+        expected = {
+            "id": "12",
+            "name": "flavor 12",
+            "ram": "256",
+            "disk": "10",
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://localhost/v1.1/flavors/12",
+                },
+            ],
+        }
+        self.assertEqual(flavor, expected)
+
+    def test_get_flavor_list_v1_1(self):
+        req = webob.Request.blank('/v1.1/flavors')
+        req.environ['api.version'] = '1.1'
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 200)
+        flavor = json.loads(res.body)["flavors"]
+        expected = [
+            {
+                "id": "1",
+                "name": "flavor 1",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://localhost/v1.1/flavors/1",
+                    },
+                ],
+            },
+            {
+                "id": "2",
+                "name": "flavor 2",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://localhost/v1.1/flavors/2",
+                    },
+                ],
+            },
+        ]
+        self.assertEqual(flavor, expected)    
+
+    def test_get_flavor_list_detail_v1_1(self):
+        req = webob.Request.blank('/v1.1/flavors/detail')
+        req.environ['api.version'] = '1.1'
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 200)
+        flavor = json.loads(res.body)["flavors"]
+        expected = [
+            {
+                "id": "1",
+                "name": "flavor 1",
+                "ram": "256",
+                "disk": "10",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://localhost/v1.1/flavors/1",
+                    },
+                ],
+            },
+            {
+                "id": "2",
+                "name": "flavor 2",
+                "ram": "256",
+                "disk": "10",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://localhost/v1.1/flavors/2",
+                    },
+                ],
+            },
+        ]
+        self.assertEqual(flavor, expected)
-- 
cgit 


From bb606c7ba42fc567f2e9989e0f560783743e5ddd Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Wed, 16 Mar 2011 16:58:38 -0400
Subject: adding bookmarks links to 1.1 flavor entities

---
 nova/api/openstack/views/flavors.py      | 13 ++++++++-
 nova/tests/api/openstack/test_flavors.py | 50 ++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/nova/api/openstack/views/flavors.py b/nova/api/openstack/views/flavors.py
index 19ac8f114..be7e68763 100644
--- a/nova/api/openstack/views/flavors.py
+++ b/nova/api/openstack/views/flavors.py
@@ -76,10 +76,21 @@ class ViewBuilder_1_1(ViewBuilder):
         return flavor_obj
 
     def _build_links(self, flavor_obj):
+        href = self.generate_href(flavor_obj["id"])
         links = [
             {
                 "rel": "self",
-                "href": self.generate_href(flavor_obj["id"]),
+                "href": href,
+            },
+            {
+                "rel": "bookmark",
+                "type": "application/json",
+                "href": href,
+            },
+            {
+                "rel": "bookmark",
+                "type": "application/xml",
+                "href": href,
             },
         ]
         return links
diff --git a/nova/tests/api/openstack/test_flavors.py b/nova/tests/api/openstack/test_flavors.py
index 197e907c4..8dfcfe293 100644
--- a/nova/tests/api/openstack/test_flavors.py
+++ b/nova/tests/api/openstack/test_flavors.py
@@ -143,6 +143,16 @@ class FlavorsTest(test.TestCase):
                     "rel": "self",
                     "href": "http://localhost/v1.1/flavors/12",
                 },
+                {
+                    "rel": "bookmark",
+                    "type": "application/json",
+                    "href": "http://localhost/v1.1/flavors/12",
+                },
+                {
+                    "rel": "bookmark",
+                    "type": "application/xml",
+                    "href": "http://localhost/v1.1/flavors/12",
+                },
             ],
         }
         self.assertEqual(flavor, expected)
@@ -162,6 +172,16 @@ class FlavorsTest(test.TestCase):
                         "rel": "self",
                         "href": "http://localhost/v1.1/flavors/1",
                     },
+                    {
+                        "rel": "bookmark",
+                        "type": "application/json",
+                        "href": "http://localhost/v1.1/flavors/1",
+                    },
+                    {
+                        "rel": "bookmark",
+                        "type": "application/xml",
+                        "href": "http://localhost/v1.1/flavors/1",
+                    },
                 ],
             },
             {
@@ -172,6 +192,16 @@ class FlavorsTest(test.TestCase):
                         "rel": "self",
                         "href": "http://localhost/v1.1/flavors/2",
                     },
+                    {
+                        "rel": "bookmark",
+                        "type": "application/json",
+                        "href": "http://localhost/v1.1/flavors/2",
+                    },
+                    {
+                        "rel": "bookmark",
+                        "type": "application/xml",
+                        "href": "http://localhost/v1.1/flavors/2",
+                    },
                 ],
             },
         ]
@@ -194,6 +224,16 @@ class FlavorsTest(test.TestCase):
                         "rel": "self",
                         "href": "http://localhost/v1.1/flavors/1",
                     },
+                    {
+                        "rel": "bookmark",
+                        "type": "application/json",
+                        "href": "http://localhost/v1.1/flavors/1",
+                    },
+                    {
+                        "rel": "bookmark",
+                        "type": "application/xml",
+                        "href": "http://localhost/v1.1/flavors/1",
+                    },
                 ],
             },
             {
@@ -206,6 +246,16 @@ class FlavorsTest(test.TestCase):
                         "rel": "self",
                         "href": "http://localhost/v1.1/flavors/2",
                     },
+                    {
+                        "rel": "bookmark",
+                        "type": "application/json",
+                        "href": "http://localhost/v1.1/flavors/2",
+                    },
+                    {
+                        "rel": "bookmark",
+                        "type": "application/xml",
+                        "href": "http://localhost/v1.1/flavors/2",
+                    },
                 ],
             },
         ]
-- 
cgit 


From 05ccc91bdb3ad47ffecee29d21835ded17f65816 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Wed, 16 Mar 2011 17:24:32 -0400
Subject: pep8

---
 nova/api/openstack/views/flavors.py      | 4 ++--
 nova/tests/api/openstack/test_flavors.py | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nova/api/openstack/views/flavors.py b/nova/api/openstack/views/flavors.py
index be7e68763..7d75c0aa2 100644
--- a/nova/api/openstack/views/flavors.py
+++ b/nova/api/openstack/views/flavors.py
@@ -61,8 +61,8 @@ class ViewBuilder(object):
 
         detail.update(simple)
 
-        return detail 
-    
+        return detail
+
     def _build_extra(self, flavor_obj):
         return flavor_obj
 
diff --git a/nova/tests/api/openstack/test_flavors.py b/nova/tests/api/openstack/test_flavors.py
index 8dfcfe293..954d72adf 100644
--- a/nova/tests/api/openstack/test_flavors.py
+++ b/nova/tests/api/openstack/test_flavors.py
@@ -46,6 +46,7 @@ def return_instance_types(context, num=2):
         instance_types[name] = stub_flavor(i, name)
     return instance_types
 
+
 def return_instance_type_not_found(context, flavorid):
     raise exception.NotFound()
 
@@ -205,7 +206,7 @@ class FlavorsTest(test.TestCase):
                 ],
             },
         ]
-        self.assertEqual(flavor, expected)    
+        self.assertEqual(flavor, expected)
 
     def test_get_flavor_list_detail_v1_1(self):
         req = webob.Request.blank('/v1.1/flavors/detail')
-- 
cgit 


From c1f7df80d22b718bc96332c2f52354627d11700d Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 17 Mar 2011 12:31:16 -0400
Subject: adding comments; removing returns from build_extra; removing
 unnecessary backslash

---
 nova/api/openstack/flavors.py       |  2 +-
 nova/api/openstack/views/flavors.py | 26 ++++++++++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py
index bc61e8d1a..6eba0f9b8 100644
--- a/nova/api/openstack/flavors.py
+++ b/nova/api/openstack/flavors.py
@@ -46,7 +46,7 @@ class Controller(wsgi.Controller):
         ctxt = req.environ['nova.context']
         flavors = db.api.instance_type_get_all(ctxt)
         builder = flavors_views.get_view_builder(req)
-        items = [builder.build(flavor, is_detail=is_detail) \
+        items = [builder.build(flavor, is_detail=is_detail)
                  for flavor in flavors.values()]
         return items
 
diff --git a/nova/api/openstack/views/flavors.py b/nova/api/openstack/views/flavors.py
index 7d75c0aa2..92003a19f 100644
--- a/nova/api/openstack/views/flavors.py
+++ b/nova/api/openstack/views/flavors.py
@@ -32,26 +32,27 @@ def get_view_builder(req):
 
 
 class ViewBuilder(object):
-    def __init__(self):
-        pass
 
     def build(self, flavor_obj, is_detail=False):
+        """Generic method used to generate a flavor entity."""
         if is_detail:
             flavor = self._build_detail(flavor_obj)
         else:
             flavor = self._build_simple(flavor_obj)
 
-        full_flavor = self._build_extra(flavor)
+        self._build_extra(flavor)
 
-        return full_flavor
+        return flavor
 
     def _build_simple(self, flavor_obj):
+        """Build a minimal representation of a flavor."""
         return {
             "id": flavor_obj["flavorid"],
             "name": flavor_obj["name"],
         }
 
     def _build_detail(self, flavor_obj):
+        """Build a more complete representation of a flavor."""
         simple = self._build_simple(flavor_obj)
 
         detail = {
@@ -64,19 +65,26 @@ class ViewBuilder(object):
         return detail
 
     def _build_extra(self, flavor_obj):
-        return flavor_obj
+        """Hook for version-specific changes to newly created flavor object."""
+        pass
 
 
 class ViewBuilder_1_1(ViewBuilder):
+    """Openstack API v1.1 flavors view builder."""
+
     def __init__(self, base_url):
+        """
+        :param base_url: url of the root wsgi application
+        """
         self.base_url = base_url
 
     def _build_extra(self, flavor_obj):
         flavor_obj["links"] = self._build_links(flavor_obj)
-        return flavor_obj
 
     def _build_links(self, flavor_obj):
+        """Generate a container of links that refer to the provided flavor."""
         href = self.generate_href(flavor_obj["id"])
+
         links = [
             {
                 "rel": "self",
@@ -93,11 +101,17 @@ class ViewBuilder_1_1(ViewBuilder):
                 "href": href,
             },
         ]
+
         return links
 
     def generate_href(self, flavor_id):
+        """Create an url that refers to a specific flavor id."""
         return "%s/flavors/%s" % (self.base_url, flavor_id)
 
 
 class ViewBuilder_1_0(ViewBuilder):
+    """
+    Openstack API v1.0 flavors view builder. Currently, there
+    are no 1.0-specific attributes of a flavor.
+    """
     pass
-- 
cgit 


From 99a3899291ef14149bee0581ad7615e07dfc55c1 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 17 Mar 2011 14:07:25 -0400
Subject: adding serialization_metadata to encode links on flavors

---
 nova/api/openstack/flavors.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py
index 6eba0f9b8..f0936332c 100644
--- a/nova/api/openstack/flavors.py
+++ b/nova/api/openstack/flavors.py
@@ -29,7 +29,11 @@ class Controller(wsgi.Controller):
     _serialization_metadata = {
         'application/xml': {
             "attributes": {
-                "flavor": ["id", "name", "ram", "disk"]}}}
+                "flavor": ["id", "name", "ram", "disk"],
+                "link": ["rel","type","href"],
+            }
+        }
+    }
 
     def index(self, req):
         """Return all flavors in brief."""
-- 
cgit 


From 5a141466db962e184ced0a57efb6bfe94ff5a246 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 17 Mar 2011 14:09:44 -0400
Subject: pep8

---
 nova/api/openstack/flavors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py
index f0936332c..e9ee9d012 100644
--- a/nova/api/openstack/flavors.py
+++ b/nova/api/openstack/flavors.py
@@ -30,7 +30,7 @@ class Controller(wsgi.Controller):
         'application/xml': {
             "attributes": {
                 "flavor": ["id", "name", "ram", "disk"],
-                "link": ["rel","type","href"],
+                "link": ["rel", "type", "href"],
             }
         }
     }
-- 
cgit 


From 1abd4e6d592fb41d86fa32c3f77fd0e0a43ca5d3 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 22 Mar 2011 10:23:33 -0400
Subject: making Controller._get_flavors is_detail a keyword argument

---
 nova/api/openstack/flavors.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py
index e9ee9d012..f7b5b722f 100644
--- a/nova/api/openstack/flavors.py
+++ b/nova/api/openstack/flavors.py
@@ -37,15 +37,15 @@ class Controller(wsgi.Controller):
 
     def index(self, req):
         """Return all flavors in brief."""
-        items = self._get_flavors(req, False)
+        items = self._get_flavors(req, is_detail=False)
         return dict(flavors=items)
 
     def detail(self, req):
         """Return all flavors in detail."""
-        items = self._get_flavors(req, True)
+        items = self._get_flavors(req, is_detail=True)
         return dict(flavors=items)
 
-    def _get_flavors(self, req, is_detail):
+    def _get_flavors(self, req, is_detail=True):
         """Helper function that returns a list of flavor dicts."""
         ctxt = req.environ['nova.context']
         flavors = db.api.instance_type_get_all(ctxt)
-- 
cgit 


From fbb8291263ae49521bbe02aa7f75c000c7f2db8d Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 24 Mar 2011 12:46:39 -0400
Subject: adding versioned controllers

---
 nova/api/openstack/__init__.py | 11 ++++++++---
 nova/api/openstack/flavors.py  | 17 ++++++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 143b1d2b2..f47422359 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -117,9 +117,6 @@ class APIRouter(wsgi.Router):
         mapper.resource("image", "images", controller=images.Controller(),
                         collection={'detail': 'GET'})
 
-        mapper.resource("flavor", "flavors", controller=flavors.Controller(),
-                        collection={'detail': 'GET'})
-
         mapper.resource("shared_ip_group", "shared_ip_groups",
                         collection={'detail': 'GET'},
                         controller=shared_ip_groups.Controller())
@@ -138,6 +135,10 @@ class APIRouterV10(APIRouter):
                         collection={'detail': 'GET'},
                         member=self.server_members)
 
+        mapper.resource("flavor", "flavors",
+                        controller=flavors.ControllerV10(),
+                        collection={'detail': 'GET'})
+
 
 class APIRouterV11(APIRouter):
     """Define routes specific to OpenStack API V1.1."""
@@ -149,6 +150,10 @@ class APIRouterV11(APIRouter):
                         collection={'detail': 'GET'},
                         member=self.server_members)
 
+        mapper.resource("flavor", "flavors",
+                        controller=flavors.ControllerV11(),
+                        collection={'detail': 'GET'})
+
 
 class Versions(wsgi.Application):
     @webob.dec.wsgify(RequestClass=wsgi.Request)
diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py
index f7b5b722f..5b99b5a6f 100644
--- a/nova/api/openstack/flavors.py
+++ b/nova/api/openstack/flavors.py
@@ -20,7 +20,7 @@ import webob
 from nova import db
 from nova import exception
 from nova import wsgi
-from nova.api.openstack.views import flavors as flavors_views
+from nova.api.openstack import views
 
 
 class Controller(wsgi.Controller):
@@ -49,7 +49,7 @@ class Controller(wsgi.Controller):
         """Helper function that returns a list of flavor dicts."""
         ctxt = req.environ['nova.context']
         flavors = db.api.instance_type_get_all(ctxt)
-        builder = flavors_views.get_view_builder(req)
+        builder = self._get_view_builder(req)
         items = [builder.build(flavor, is_detail=is_detail)
                  for flavor in flavors.values()]
         return items
@@ -62,6 +62,17 @@ class Controller(wsgi.Controller):
         except exception.NotFound:
             return webob.exc.HTTPNotFound()
 
-        builder = flavors_views.get_view_builder(req)
+        builder = self._get_view_builder(req)
         values = builder.build(flavor, is_detail=True)
         return dict(flavor=values)
+
+
+class ControllerV10(Controller):
+    def _get_view_builder(self, req):
+        return views.flavors.ViewBuilder()
+
+
+class ControllerV11(Controller):
+    def _get_view_builder(self, req):
+        base_url = req.application_url
+        return views.flavors.ViewBuilderV11(base_url)
-- 
cgit