changed extension alias to os-floating-ips

2 files changed, 7 insertions, 7 deletions

diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py
index ca192f501..914ec5bfb 100644
--- a/nova/api/openstack/contrib/floating_ips.py
+++ b/nova/api/openstack/contrib/floating_ips.py
@@ -162,7 +162,7 @@ class Floating_ips(extensions.ExtensionDescriptor):
     def get_resources(self):
         resources = []
 
-        res = extensions.ResourceExtension('floating_ips',
+        res = extensions.ResourceExtension('os-floating-ips',
                          FloatingIPController(),
                          member_actions={
                             'associate': 'POST',
diff --git a/nova/tests/api/openstack/contrib/test_floating_ips.py b/nova/tests/api/openstack/contrib/test_floating_ips.py
index bf62925aa..de1eb2f53 100644
--- a/nova/tests/api/openstack/contrib/test_floating_ips.py
+++ b/nova/tests/api/openstack/contrib/test_floating_ips.py
@@ -112,7 +112,7 @@ class FloatingIpTest(test.TestCase):
         self.assertEqual(view['floating_ip']['instance_id'], None)
 
     def test_floating_ips_list(self):
-        req = webob.Request.blank('/v1.1/floating_ips')
+        req = webob.Request.blank('/v1.1/os-floating-ips')
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
         res_dict = json.loads(res.body)
@@ -127,7 +127,7 @@ class FloatingIpTest(test.TestCase):
         self.assertEqual(res_dict, response)
 
     def test_floating_ip_show(self):
-        req = webob.Request.blank('/v1.1/floating_ips/1')
+        req = webob.Request.blank('/v1.1/os-floating-ips/1')
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
         res_dict = json.loads(res.body)
@@ -137,7 +137,7 @@ class FloatingIpTest(test.TestCase):
         self.assertEqual(res_dict['floating_ip']['instance_id'], None)
 
     def test_floating_ip_allocate(self):
-        req = webob.Request.blank('/v1.1/floating_ips')
+        req = webob.Request.blank('/v1.1/os-floating-ips')
         req.method = 'POST'
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
@@ -148,7 +148,7 @@ class FloatingIpTest(test.TestCase):
         self.assertEqual(ip, expected)
 
     def test_floating_ip_release(self):
-        req = webob.Request.blank('/v1.1/floating_ips/1')
+        req = webob.Request.blank('/v1.1/os-floating-ips/1')
         req.method = 'DELETE'
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
@@ -160,7 +160,7 @@ class FloatingIpTest(test.TestCase):
 
     def test_floating_ip_associate(self):
         body = dict(associate_address=dict(fixed_ip='1.2.3.4'))
-        req = webob.Request.blank('/v1.1/floating_ips/1/associate')
+        req = webob.Request.blank('/v1.1/os-floating-ips/1/associate')
         req.method = 'POST'
         req.body = json.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -175,7 +175,7 @@ class FloatingIpTest(test.TestCase):
         self.assertEqual(actual, expected)
 
     def test_floating_ip_disassociate(self):
-        req = webob.Request.blank('/v1.1/floating_ips/1/disassociate')
+        req = webob.Request.blank('/v1.1/os-floating-ips/1/disassociate')
         req.method = 'POST'
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)