From 14337b0a31c8f04d8044e234eb295b41a9a9c5ce Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Mon, 28 Mar 2011 14:02:53 -0400
Subject: adding shared_ip_groups testing; replacing all shared_ip_groups
 contoller code with HTTPNotImplemented; moving shared_ip_groups controller to
 APIRouterV10

---
 nova/api/openstack/__init__.py                    |  8 +++---
 nova/api/openstack/shared_ip_groups.py            |  6 ++---
 nova/tests/api/openstack/test_shared_ip_groups.py | 30 ++++++++++++++++++++---
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 8fabbce8e..cf53ffcd6 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -119,10 +119,6 @@ class APIRouter(wsgi.Router):
         mapper.resource("image", "images", controller=images.Controller(),
                         collection={'detail': 'GET'})
 
-        mapper.resource("shared_ip_group", "shared_ip_groups",
-                        collection={'detail': 'GET'},
-                        controller=shared_ip_groups.Controller())
-
         _limits = limits.LimitsController()
         mapper.resource("limit", "limits", controller=_limits)
 
@@ -141,6 +137,10 @@ class APIRouterV10(APIRouter):
                         controller=flavors.ControllerV10(),
                         collection={'detail': 'GET'})
 
+        mapper.resource("shared_ip_group", "shared_ip_groups",
+                        collection={'detail': 'GET'},
+                        controller=shared_ip_groups.Controller())
+
 
 class APIRouterV11(APIRouter):
     """Define routes specific to OpenStack API V1.1."""
diff --git a/nova/api/openstack/shared_ip_groups.py b/nova/api/openstack/shared_ip_groups.py
index 5d78f9377..ee7991d7f 100644
--- a/nova/api/openstack/shared_ip_groups.py
+++ b/nova/api/openstack/shared_ip_groups.py
@@ -42,11 +42,11 @@ class Controller(wsgi.Controller):
 
     def index(self, req):
         """ Returns a list of Shared IP Groups for the user """
-        return dict(sharedIpGroups=[])
+        raise faults.Fault(exc.HTTPNotImplemented())
 
     def show(self, req, id):
         """ Shows in-depth information on a specific Shared IP Group """
-        return _translate_keys({})
+        raise faults.Fault(exc.HTTPNotImplemented())
 
     def update(self, req, id):
         """ You can't update a Shared IP Group """
@@ -58,7 +58,7 @@ class Controller(wsgi.Controller):
 
     def detail(self, req):
         """ Returns a complete list of Shared IP Groups """
-        return _translate_detail_keys({})
+        raise faults.Fault(exc.HTTPNotImplemented())
 
     def create(self, req):
         """ Creates a new Shared IP group """
diff --git a/nova/tests/api/openstack/test_shared_ip_groups.py b/nova/tests/api/openstack/test_shared_ip_groups.py
index b4de2ef41..c2bd7e45a 100644
--- a/nova/tests/api/openstack/test_shared_ip_groups.py
+++ b/nova/tests/api/openstack/test_shared_ip_groups.py
@@ -16,25 +16,49 @@
 #    under the License.
 
 import stubout
+import webob
 
 from nova import test
 from nova.api.openstack import shared_ip_groups
+from nova.tests.api.openstack import fakes
 
 
 class SharedIpGroupsTest(test.TestCase):
     def setUp(self):
         super(SharedIpGroupsTest, self).setUp()
         self.stubs = stubout.StubOutForTesting()
+        fakes.FakeAuthManager.reset_fake_data()
+        fakes.FakeAuthDatabase.data = {}
+        fakes.stub_out_auth(self.stubs)
 
     def tearDown(self):
         self.stubs.UnsetAll()
         super(SharedIpGroupsTest, self).tearDown()
 
     def test_get_shared_ip_groups(self):
-        pass
+        req = webob.Request.blank('/v1.0/shared_ip_groups')
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 501)
 
     def test_create_shared_ip_group(self):
-        pass
+        req = webob.Request.blank('/v1.0/shared_ip_groups')
+        req.method = 'POST'
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 501)
+
+    def test_update_shared_ip_group(self):
+        req = webob.Request.blank('/v1.0/shared_ip_groups/12')
+        req.method = 'PUT'
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 501)
 
     def test_delete_shared_ip_group(self):
-        pass
+        req = webob.Request.blank('/v1.0/shared_ip_groups/12')
+        req.method = 'DELETE'
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 501)
+
+    def test_deprecated_v11(self):
+        req = webob.Request.blank('/v1.1/shared_ip_groups')
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 404)
-- 
cgit