From 4b0c9bafc2725cbe4d535b6f70c814e62ec165fc Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 1 Jun 2015 17:43:03 -0400 Subject: [PATCH] Get rid of oslo-incubator copy of middleware We have already moved away from openstack/common/middleware modules to the oslo_middlware library. Let us cleanup the remaining files here. Change-Id: I701b08a28884eb56d12f2829483fe94aa8d2fd1d --- .../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 cinder/openstack/common/middleware/__init__.py delete mode 100644 cinder/openstack/common/middleware/catch_errors.py delete mode 100644 cinder/openstack/common/middleware/request_id.py diff --git a/cinder/openstack/common/middleware/__init__.py b/cinder/openstack/common/middleware/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/cinder/openstack/common/middleware/catch_errors.py b/cinder/openstack/common/middleware/catch_errors.py deleted file mode 100644 index db5356c97..000000000 --- a/cinder/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 cinder.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/cinder/openstack/common/middleware/request_id.py b/cinder/openstack/common/middleware/request_id.py deleted file mode 100644 index 8c6c11c47..000000000 --- a/cinder/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 cinder.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 00f22d387..0714af116 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -8,7 +8,6 @@ module=gettextutils module=imageutils module=install_venv_common module=loopingcall -module=middleware module=periodic_task module=policy module=scheduler -- 2.45.2