From 9d056b6fadcefed9ef9573bd89125b00af5e2726 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 17 Feb 2011 10:50:49 -0600
Subject: More testing

---
 nova/api/openstack/__init__.py           |  1 +
 nova/api/openstack/flavors.py            | 14 ++++++++++++--
 nova/tests/api/openstack/test_flavors.py |  6 ++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 056c7dd27..1fafebe37 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -73,6 +73,7 @@ class APIRouter(wsgi.Router):
         server_members = {'action': 'POST'}
         if FLAGS.allow_admin_api:
             LOG.debug(_("Including admin operations in API."))
+
             server_members['pause'] = 'POST'
             server_members['unpause'] = 'POST'
             server_members["diagnostics"] = "GET"
diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py
index 215f0b8a6..a3a664506 100644
--- a/nova/api/openstack/flavors.py
+++ b/nova/api/openstack/flavors.py
@@ -58,11 +58,21 @@ class Controller(wsgi.Controller):
 
     def create(self, req):
         """Create a flavor."""
+        instance_types.create(
+            name,
+            memory,
+            vcpus,
+            local_gb,
+            flavor_id,
+            swap,
+            rxtx_quota,
+            rxtx_cap)
         print "CREATE! %s" % req
 
-    def delete(self, req, id):
+    def delete(self, req, name):
         """Delete a flavor."""
-        print "DELETE! %s %s" % (req, id)
+        instance_type.destroy(name)
+        print "DELETE! %s %s" % (req, name)
 
     def _all_ids(self):
         """Return the list of all flavorids."""
diff --git a/nova/tests/api/openstack/test_flavors.py b/nova/tests/api/openstack/test_flavors.py
index 7bfc46e0b..209ace0f8 100644
--- a/nova/tests/api/openstack/test_flavors.py
+++ b/nova/tests/api/openstack/test_flavors.py
@@ -46,12 +46,14 @@ class FlavorsTest(unittest.TestCase):
         self.assertEqual(res.status_int, 200)
 
     def test_create_flavor(self):
-        req = webob.Request.blank("/v1.0/flavors/create/test")
+        req = webob.Request.blank("/v1.0/flavors")
+        req.method = "POST"
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
 
     def test_delete_flavor(self):
-        req = webob.Request.blank("/v1.0/flavors/delete/test")
+        req = webob.Request.blank("/v1.0/flavors/1")
+        req.method = "DELETE"
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
 
-- 
cgit