fix tests for extensions

2 files changed, 24 insertions, 19 deletions

diff --git a/nova/tests/api/openstack/contrib/test_floating_ips.py b/nova/tests/api/openstack/contrib/test_floating_ips.py
index 5dca0b5ea..bc3c20bf2 100644
--- a/nova/tests/api/openstack/contrib/test_floating_ips.py
+++ b/nova/tests/api/openstack/contrib/test_floating_ips.py
@@ -12,20 +12,23 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
+import json
+import stubout
+import webob
+
 from nova import context
 from nova import db
 from nova import test
 from nova import network
 from nova.tests.api.openstack import fakes
 
-import stubout
-import webob
-
 from nova.api.openstack.contrib.floating_ips import \
     _translate_floating_ip_view
 
-def network_api_get():
-    pass
+def network_api_get(self, context, id):
+    return {'id': 1,
+            'address': '10.10.10.10'}
 
 def network_api_list():
     pass
@@ -61,17 +64,17 @@ class FloatingIpTest(test.TestCase):
         fakes.stub_out_networking(self.stubs)
         fakes.stub_out_rate_limiting(self.stubs)
         fakes.stub_out_auth(self.stubs)
-        self.stubs.Set(network.api, "get",
+        self.stubs.Set(network.api.API, "get",
                        network_api_get)
-        self.stubs.Set(network.api, "list",
+        self.stubs.Set(network.api.API, "list",
                        network_api_list)
-        self.stubs.Set(network.api, "allocate_floating_ip",
+        self.stubs.Set(network.api.API, "allocate_floating_ip",
                        network_api_allocate)
-        self.stubs.Set(network.api, "release_floating_ip",
+        self.stubs.Set(network.api.API, "release_floating_ip",
                        network_api_release)
-        self.stubs.Set(network.api, "associate_floating_ip",
+        self.stubs.Set(network.api.API, "associate_floating_ip",
                        network_api_associate)
-        self.stubs.Set(network.api, "disassociate_floating_ip",
+        self.stubs.Set(network.api.API, "disassociate_floating_ip",
                        network_api_disassociate)
         self.context = context.get_admin_context()
 
@@ -97,7 +100,13 @@ class FloatingIpTest(test.TestCase):
         pass
 
     def test_floating_ip_show(self):
-        pass
+        req = webob.Request.blank('/v1.1/floating_ips/1')
+        res = req.get_response(fakes.wsgi_app())
+        res_dict = json.loads(res.body)
+        self.assertEqual(res_dict['floating_ip']['id'], 1)
+        self.assertEqual(res_dict['floating_ip']['ip'], '10.10.10.10')
+        self.assertEqual(res_dict['floating_ip']['fixed_ip'], None)
+        self.assertEqual(res_dict['floating_ip']['instance_id'], None)
 
     def test_floating_ip_allocate(self):
         pass
diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index a10fb7433..a818c1330 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 import copy
-import json
 import random
 import string
 
@@ -29,19 +28,15 @@ from glance.common import exception as glance_exc
 
 from nova import context
 from nova import exception as exc
-from nova import flags
 from nova import utils
 import nova.api.openstack.auth
 from nova.api import openstack
 from nova.api.openstack import auth
+from nova.api.openstack import extensions
 from nova.api.openstack import versions
 from nova.api.openstack import limits
 from nova.auth.manager import User, Project
 import nova.image.fake
-from nova.image import glance
-from nova.image import local
-from nova.image import service
-from nova.tests import fake_flags
 from nova.wsgi import Router
 
 
@@ -83,7 +78,8 @@ def wsgi_app(inner_app10=None, inner_app11=None):
     api10 = openstack.FaultWrapper(auth.AuthMiddleware(
               limits.RateLimitingMiddleware(inner_app10)))
     api11 = openstack.FaultWrapper(auth.AuthMiddleware(
-              limits.RateLimitingMiddleware(inner_app11)))
+              limits.RateLimitingMiddleware(
+                  extensions.ExtensionMiddleware(inner_app11))))
     mapper['/v1.0'] = api10
     mapper['/v1.1'] = api11
     mapper['/'] = openstack.FaultWrapper(versions.Versions())