From 7988e32202cef7adacc41ba51ec94db8ce52ded3 Mon Sep 17 00:00:00 2001 From: Vu Cong Tuan Date: Tue, 27 Mar 2018 13:51:05 +0700 Subject: [PATCH] Removing deprecated module neutron.api.versions 'Versions.factory()' is deprecated in version 'Queens' and was marked to be removed 'Rocky'. This patch removes it and switches to use neutron.pecan_wsgi.app.versions_factory instead. In addition, neutron.api.versions is removed because this deprecated module isn't used anywhere. Change-Id: I08d1725a973c734b55771918915428377fb7d3b4 --- neutron/api/versions.py | 27 ------------------- .../test_app.py} | 10 +++---- 2 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 neutron/api/versions.py rename neutron/tests/unit/{api/test_versions.py => pecan_wsgi/test_app.py} (71%) diff --git a/neutron/api/versions.py b/neutron/api/versions.py deleted file mode 100644 index 6d986181303..00000000000 --- a/neutron/api/versions.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2011 Citrix Systems. -# All Rights Reserved. -# -# 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. - -from debtcollector import removals - -from neutron.pecan_wsgi import app as pecan_app - - -class Versions(object): - - @removals.remove(version="Queens", removal_version="Rocky", - message="Use neutron.pecan_wsgi.app:versions_factory") - @classmethod - def factory(cls, global_config, **local_config): - return pecan_app.versions_factory(global_config, **local_config) diff --git a/neutron/tests/unit/api/test_versions.py b/neutron/tests/unit/pecan_wsgi/test_app.py similarity index 71% rename from neutron/tests/unit/api/test_versions.py rename to neutron/tests/unit/pecan_wsgi/test_app.py index 5929d385bb8..a975c890c36 100644 --- a/neutron/tests/unit/api/test_versions.py +++ b/neutron/tests/unit/pecan_wsgi/test_app.py @@ -12,15 +12,13 @@ import mock -from neutron.api import versions +from neutron import pecan_wsgi from neutron.tests import base -@mock.patch('neutron.api.versions.Versions.__init__', return_value=None) @mock.patch('neutron.pecan_wsgi.app.versions_factory') -class TestVersions(base.BaseTestCase): +class TestVersionsFactory(base.BaseTestCase): - def test_pecan_factory(self, pecan_mock, legacy_mock): - versions.Versions.factory({}) + def test_versions_factory(self, pecan_mock): + pecan_wsgi.app.versions_factory({}) pecan_mock.assert_called_once_with({}) - legacy_mock.assert_not_called()