Removes fixed ips extension from V3 API

The fixed ip extension was one of the first ported to the V3 API
but a later decision around not supporting nova network in the V3 API
means that this extension is not required for V3. The fixed ip extension
only supports nova network, not neutron and the same functionality
can be accessed directly through neutron.

Also changes some extension tests to use a different extension
for white/black list testing

Partially implements bp nova-v3-api

Change-Id: Ie589170e863ee489661e789c5134ed8349ced279

1 files changed, 12 insertions, 12 deletions

diff --git a/nova/tests/api/openstack/compute/test_v3_extensions.py b/nova/tests/api/openstack/compute/test_v3_extensions.py
index 22c36f5573..d1b586fedf 100644
--- a/nova/tests/api/openstack/compute/test_v3_extensions.py
+++ b/nova/tests/api/openstack/compute/test_v3_extensions.py
@@ -72,10 +72,10 @@ class ExtensionLoadingTestCase(test.TestCase):
 
     def test_extensions_blacklist(self):
         app = compute.APIRouterV3()
-        self.assertIn('os-fixed-ips', app._loaded_extension_info.extensions)
-        CONF.set_override('extensions_blacklist', ['os-fixed-ips'], 'osapi_v3')
+        self.assertIn('os-hosts', app._loaded_extension_info.extensions)
+        CONF.set_override('extensions_blacklist', ['os-hosts'], 'osapi_v3')
         app = compute.APIRouterV3()
-        self.assertNotIn('os-fixed-ips', app._loaded_extension_info.extensions)
+        self.assertNotIn('os-hosts', app._loaded_extension_info.extensions)
 
     def test_extensions_whitelist_accept(self):
         # NOTE(maurosr): just to avoid to get an exception raised for not
@@ -85,11 +85,11 @@ class ExtensionLoadingTestCase(test.TestCase):
         self.addCleanup(self._set_v3_core, v3_core)
 
         app = compute.APIRouterV3()
-        self.assertIn('os-fixed-ips', app._loaded_extension_info.extensions)
-        CONF.set_override('extensions_whitelist', ['servers', 'os-fixed-ips'],
+        self.assertIn('os-hosts', app._loaded_extension_info.extensions)
+        CONF.set_override('extensions_whitelist', ['servers', 'os-hosts'],
                           'osapi_v3')
         app = compute.APIRouterV3()
-        self.assertIn('os-fixed-ips', app._loaded_extension_info.extensions)
+        self.assertIn('os-hosts', app._loaded_extension_info.extensions)
 
     def test_extensions_whitelist_block(self):
         # NOTE(maurosr): just to avoid to get an exception raised for not
@@ -99,10 +99,10 @@ class ExtensionLoadingTestCase(test.TestCase):
         self.addCleanup(self._set_v3_core, v3_core)
 
         app = compute.APIRouterV3()
-        self.assertIn('os-fixed-ips', app._loaded_extension_info.extensions)
+        self.assertIn('os-hosts', app._loaded_extension_info.extensions)
         CONF.set_override('extensions_whitelist', ['servers'], 'osapi_v3')
         app = compute.APIRouterV3()
-        self.assertNotIn('os-fixed-ips', app._loaded_extension_info.extensions)
+        self.assertNotIn('os-hosts', app._loaded_extension_info.extensions)
 
     def test_blacklist_overrides_whitelist(self):
         # NOTE(maurosr): just to avoid to get an exception raised for not
@@ -112,12 +112,12 @@ class ExtensionLoadingTestCase(test.TestCase):
         self.addCleanup(self._set_v3_core, v3_core)
 
         app = compute.APIRouterV3()
-        self.assertIn('os-fixed-ips', app._loaded_extension_info.extensions)
-        CONF.set_override('extensions_whitelist', ['servers', 'os-fixed-ips'],
+        self.assertIn('os-hosts', app._loaded_extension_info.extensions)
+        CONF.set_override('extensions_whitelist', ['servers', 'os-hosts'],
                           'osapi_v3')
-        CONF.set_override('extensions_blacklist', ['os-fixed-ips'], 'osapi_v3')
+        CONF.set_override('extensions_blacklist', ['os-hosts'], 'osapi_v3')
         app = compute.APIRouterV3()
-        self.assertNotIn('os-fixed-ips', app._loaded_extension_info.extensions)
+        self.assertNotIn('os-hosts', app._loaded_extension_info.extensions)
         self.assertIn('servers', app._loaded_extension_info.extensions)
         self.assertEqual(len(app._loaded_extension_info.extensions), 1)