Merge "Totally freeze the extension_info API"

1 files changed, 2 insertions, 154 deletions

diff --git a/nova/tests/unit/api/openstack/compute/test_extension_info.py b/nova/tests/unit/api/openstack/compute/test_extension_info.py
index 93f36bdcb3..ed901989f5 100644
--- a/nova/tests/unit/api/openstack/compute/test_extension_info.py
+++ b/nova/tests/unit/api/openstack/compute/test_extension_info.py
@@ -12,8 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import copy
-
 import mock
 import webob
 
@@ -24,163 +22,15 @@ from nova import test
 from nova.tests.unit.api.openstack import fakes
 
 
-FAKE_UPDATED_DATE = extension_info.FAKE_UPDATED_DATE
-
-# NOTE(sdague): this whole test module is short term while we shift
-# the extensions into main path code. Some short cuts are taken in the
-# interim to keep these extension tests.
-
-
-class fake_extension(object):
-    def __init__(self, name, alias, description, version):
-        self.name = name
-        self.alias = alias
-        self.__doc__ = description
-        self.version = version
-
-
-fake_extensions = {
-    'ext1-alias': fake_extension('ext1', 'ext1-alias', 'ext1 description', 1),
-    'ext2-alias': fake_extension('ext2', 'ext2-alias', 'ext2 description', 2),
-    'ext3-alias': fake_extension('ext3', 'ext3-alias', 'ext3 description', 1)
-}
-
-
-simulated_extension_list = {
-    'servers': fake_extension('Servers', 'servers', 'Servers.', 1),
-    'images': fake_extension('Images', 'images', 'Images.', 2),
-    'os-quota-sets': fake_extension('Quotas', 'os-quota-sets',
-                                    'Quotas management support', 1),
-    'os-cells': fake_extension('Cells', 'os-cells',
-                                    'Cells description', 1),
-    'os-flavor-access': fake_extension('FlavorAccess', 'os-flavor-access',
-                                    'Flavor access support.', 1)
-}
-
-
-class ExtensionInfoTest(test.NoDBTestCase):
-
-    def setUp(self):
-        super(ExtensionInfoTest, self).setUp()
-        ext_info = extension_info.LoadedExtensionInfo()
-        ext_info.extensions = fake_extensions
-        self.controller = extension_info.ExtensionInfoController(ext_info)
-
-    @mock.patch.object(policy, 'authorize', mock.Mock(return_value=True))
-    def test_extension_info_list(self):
-        req = fakes.HTTPRequestV21.blank('/extensions')
-        res_dict = self.controller.index(req)
-        # NOTE(sdague): because of hardcoded extensions the count is
-        # going to grow, and that's fine. We'll just check that it's
-        # greater than the 3 that we inserted.
-        self.assertGreaterEqual(len(res_dict['extensions']), 3)
-
-        # NOTE(sdague): filter the extension list by only ones that
-        # are the fake alias names, otherwise we get errors as we
-        # migrate extensions into the hardcoded list.
-        for e in [x for x in res_dict['extensions'] if '-alias' in x['alias']]:
-            self.assertIn(e['alias'], fake_extensions)
-            self.assertEqual(e['name'], fake_extensions[e['alias']].name)
-            self.assertEqual(e['alias'], fake_extensions[e['alias']].alias)
-            self.assertEqual(e['description'],
-                             fake_extensions[e['alias']].__doc__)
-            self.assertEqual(e['updated'], FAKE_UPDATED_DATE)
-            self.assertEqual(e['links'], [])
-            self.assertEqual(6, len(e))
-
-    @mock.patch.object(policy, 'authorize', mock.Mock(return_value=True))
-    def test_extension_info_show(self):
-        req = fakes.HTTPRequestV21.blank('/extensions/ext1-alias')
-        res_dict = self.controller.show(req, 'ext1-alias')
-        self.assertEqual(1, len(res_dict))
-        self.assertEqual(res_dict['extension']['name'],
-                         fake_extensions['ext1-alias'].name)
-        self.assertEqual(res_dict['extension']['alias'],
-                         fake_extensions['ext1-alias'].alias)
-        self.assertEqual(res_dict['extension']['description'],
-                         fake_extensions['ext1-alias'].__doc__)
-        self.assertEqual(res_dict['extension']['updated'], FAKE_UPDATED_DATE)
-        self.assertEqual(res_dict['extension']['links'], [])
-        self.assertEqual(6, len(res_dict['extension']))
-
-
 class ExtensionInfoV21Test(test.NoDBTestCase):
 
     def setUp(self):
         super(ExtensionInfoV21Test, self).setUp()
-        ext_info = extension_info.LoadedExtensionInfo()
-        ext_info.extensions = simulated_extension_list
-        self.controller = extension_info.ExtensionInfoController(ext_info)
+        self.controller = extension_info.ExtensionInfoController()
         patcher = mock.patch.object(policy, 'authorize', return_value=True)
         patcher.start()
         self.addCleanup(patcher.stop)
 
-    def test_extension_info_list(self):
-        req = fakes.HTTPRequest.blank('/extensions')
-        res_dict = self.controller.index(req)
-        # NOTE(sdague): because of hardcoded extensions the count is
-        # going to grow, and that's fine. We'll just check that it's
-        # greater than the 12 that we inserted.
-        self.assertGreaterEqual(len(res_dict['extensions']), 12)
-
-        expected_output = copy.deepcopy(simulated_extension_list)
-        del expected_output['images']
-        del expected_output['servers']
-        expected_output['os-cell-capacities'] = fake_extension(
-            'CellCapacities', 'os-cell-capacities', 'Adding functionality'
-            ' to get cell capacities.', -1)
-        expected_output['os-server-sort-keys'] = fake_extension(
-            'ServerSortKeys', 'os-server-sort-keys', 'Add sorting'
-            ' support in get Server v2 API.', -1)
-        expected_output['os-user-quotas'] = fake_extension(
-            'UserQuotas', 'os-user-quotas', 'Project user quota support.', -1)
-        expected_output['os-extended-quotas'] = fake_extension(
-            'ExtendedQuotas', 'os-extended-quotas', 'Adds ability for'
-            ' admins to delete quota and optionally force the update'
-            ' Quota command.', -1)
-        expected_output['os-create-server-ext'] = fake_extension(
-            'Createserverext', 'os-create-server-ext', 'Extended support to'
-            ' the Create Server v1.1 API.', -1)
-        expected_output['OS-EXT-IPS'] = fake_extension(
-            'ExtendedIps', 'OS-EXT-IPS', 'Adds type parameter to the'
-            ' ip list.', -1)
-        expected_output['OS-EXT-IPS-MAC'] = fake_extension(
-            'ExtendedIpsMac', 'OS-EXT-IPS-MAC', 'Adds mac address parameter'
-            ' to the ip list.', -1)
-        expected_output['os-server-list-multi-status'] = fake_extension(
-            'ServerListMultiStatus', 'os-server-list-multi-status',
-            'Allow to filter the servers by a set of status values.', -1)
-        expected_output['os-server-start-stop'] = fake_extension(
-            'ServerStartStop', 'os-server-start-stop', 'Start/Stop instance'
-            ' compute API support.', -1)
-
-        # NOTE(sdague): filter the extension list by only ones that
-        # are the fake alias names, otherwise we get errors as we
-        # migrate extensions into the hardcoded list.
-        for e in [x for x in res_dict['extensions'] if '-alias' in x['alias']]:
-            self.assertIn(e['alias'], expected_output)
-            self.assertEqual(e['name'], expected_output[e['alias']].name)
-            self.assertEqual(e['alias'], expected_output[e['alias']].alias)
-            self.assertEqual(e['description'],
-                             expected_output[e['alias']].__doc__)
-            self.assertEqual(e['updated'], FAKE_UPDATED_DATE)
-            self.assertEqual(e['links'], [])
-            self.assertEqual(6, len(e))
-
-    def test_extension_info_show(self):
-        req = fakes.HTTPRequest.blank('/extensions/os-cells')
-        res_dict = self.controller.show(req, 'os-cells')
-        self.assertEqual(1, len(res_dict))
-        self.assertEqual(res_dict['extension']['name'],
-                         simulated_extension_list['os-cells'].name)
-        self.assertEqual(res_dict['extension']['alias'],
-                         simulated_extension_list['os-cells'].alias)
-        self.assertEqual(res_dict['extension']['description'],
-                         simulated_extension_list['os-cells'].__doc__)
-        self.assertEqual(res_dict['extension']['updated'], FAKE_UPDATED_DATE)
-        self.assertEqual(res_dict['extension']['links'], [])
-        self.assertEqual(6, len(res_dict['extension']))
-
     def test_extension_info_show_servers_not_present(self):
         req = fakes.HTTPRequest.blank('/extensions/servers')
         self.assertRaises(webob.exc.HTTPNotFound, self.controller.show,
@@ -190,9 +40,7 @@ class ExtensionInfoV21Test(test.NoDBTestCase):
 class ExtensionInfoPolicyEnforcementV21(test.NoDBTestCase):
     def setUp(self):
         super(ExtensionInfoPolicyEnforcementV21, self).setUp()
-        ext_info = extension_info.LoadedExtensionInfo()
-        ext_info.extensions = fake_extensions
-        self.controller = extension_info.ExtensionInfoController(ext_info)
+        self.controller = extension_info.ExtensionInfoController()
         self.req = fakes.HTTPRequest.blank('')
 
     def _test_extension_policy_failed(self, action, *args):