From 29ea6436070762d38d17d9a34968bed8651b7c4b Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 20 May 2015 23:17:19 +0200 Subject: [PATCH] Remove middleware oslo-incubator module The module was used during Kilo cycle to provide backwards compatibility for users that upgrade to the release without updating their api-paste.ini. We have issued the deprecation warning for a cycle now, so we should be ok to just drop the compatibility layer. Note that the change may require a notion in release notes to make sure everyone is notified, even if they don't look through their logs. DocImpact Change-Id: I41693f4613b5a69a01a33e54f90e82177f42e1af --- .../openstack/common/middleware/__init__.py | 0 .../common/middleware/catch_errors.py | 23 ---------------- .../openstack/common/middleware/request_id.py | 27 ------------------- openstack-common.conf | 1 - 4 files changed, 51 deletions(-) delete mode 100644 neutron/openstack/common/middleware/__init__.py delete mode 100644 neutron/openstack/common/middleware/catch_errors.py delete mode 100644 neutron/openstack/common/middleware/request_id.py diff --git a/neutron/openstack/common/middleware/__init__.py b/neutron/openstack/common/middleware/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/neutron/openstack/common/middleware/catch_errors.py b/neutron/openstack/common/middleware/catch_errors.py deleted file mode 100644 index 12c543be8..000000000 --- a/neutron/openstack/common/middleware/catch_errors.py +++ /dev/null @@ -1,23 +0,0 @@ -# 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. - -"""Compatibility shim for Kilo, while operators migrate to oslo.middleware.""" - -from oslo_middleware import catch_errors - -from neutron.openstack.common import versionutils - - -@versionutils.deprecated(as_of=versionutils.deprecated.KILO, - in_favor_of='oslo.middleware.CatchErrors') -class CatchErrorsMiddleware(catch_errors.CatchErrors): - pass diff --git a/neutron/openstack/common/middleware/request_id.py b/neutron/openstack/common/middleware/request_id.py deleted file mode 100644 index 29929682c..000000000 --- a/neutron/openstack/common/middleware/request_id.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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. - -"""Compatibility shim for Kilo, while operators migrate to oslo.middleware.""" - -from oslo_middleware import request_id - -from neutron.openstack.common import versionutils - - -ENV_REQUEST_ID = 'openstack.request_id' -HTTP_RESP_HEADER_REQUEST_ID = 'x-openstack-request-id' - - -@versionutils.deprecated(as_of=versionutils.deprecated.KILO, - in_favor_of='oslo.middleware.RequestId') -class RequestIdMiddleware(request_id.RequestId): - pass diff --git a/openstack-common.conf b/openstack-common.conf index 1793a9d3a..549005c12 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -5,7 +5,6 @@ module=eventlet_backdoor module=fileutils module=install_venv_common module=loopingcall -module=middleware module=periodic_task module=policy module=service -- 2.45.2