From c11e9c4848bc07c81315a6563e4a81640e8f7699 Mon Sep 17 00:00:00 2001 From: He Jie Xu Date: Wed, 19 Jul 2017 11:49:19 +0800 Subject: [PATCH] Remove the unittest for plugin framework The extension/plugin mechanism is removed from the Nova API. This patch removed related unittest. Partial-implement-blueprint api-no-more-extensions-pike Change-Id: I1c5a1dccb08bd0b869cb206b247d6cb744e76163 --- .../tests/unit/api/openstack/compute/basic.py | 43 ------------------- .../compute/test_plugin_framework.py | 33 -------------- setup.cfg | 1 - 3 files changed, 77 deletions(-) delete mode 100644 nova/tests/unit/api/openstack/compute/basic.py delete mode 100644 nova/tests/unit/api/openstack/compute/test_plugin_framework.py diff --git a/nova/tests/unit/api/openstack/compute/basic.py b/nova/tests/unit/api/openstack/compute/basic.py deleted file mode 100644 index b4aa12d493b8..000000000000 --- a/nova/tests/unit/api/openstack/compute/basic.py +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2014 IBM Corp. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -"""Basic Test Extension""" - -from nova.api.openstack import extensions -from nova.api.openstack import wsgi - - -ALIAS = 'test-basic' - - -class BasicController(wsgi.Controller): - - def index(self, req): - data = {'param': 'val'} - return data - - -class Basic(extensions.V21APIExtensionBase): - """Basic Test Extension.""" - - name = "BasicTest" - alias = ALIAS - version = 1 - - def get_resources(self): - resource = extensions.ResourceExtension('test', BasicController()) - return [resource] - - def get_controller_extensions(self): - return [] diff --git a/nova/tests/unit/api/openstack/compute/test_plugin_framework.py b/nova/tests/unit/api/openstack/compute/test_plugin_framework.py deleted file mode 100644 index d30a2ae814b0..000000000000 --- a/nova/tests/unit/api/openstack/compute/test_plugin_framework.py +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2014 IBM Corp. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# 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 mock -from oslo_serialization import jsonutils - -from nova import test -from nova.tests.unit.api.openstack import fakes - - -class PluginTest(test.NoDBTestCase): - - @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace") - def test_plugin_framework_index(self, mock_namespace): - mock_namespace.return_value = 'nova.api.v21.test_extensions' - - app = fakes.wsgi_app_v21() - req = fakes.HTTPRequest.blank('/v2/fake/test') - res = req.get_response(app) - self.assertEqual(200, res.status_int) - resp_json = jsonutils.loads(res.body) - self.assertEqual('val', resp_json['param']) diff --git a/setup.cfg b/setup.cfg index 1c86c2d2cce9..73768fa9d191 100644 --- a/setup.cfg +++ b/setup.cfg @@ -74,7 +74,6 @@ wsgi_scripts = nova-metadata-wsgi = nova.api.metadata.wsgi:init_application nova.api.v21.test_extensions = - basic = nova.tests.unit.api.openstack.compute.basic:Basic microversions = nova.tests.unit.api.openstack.compute.microversions:Microversions nova.ipv6_backend =