From 1b72563230fbb18ca6206572ebc3faacd9a19d81 Mon Sep 17 00:00:00 2001 From: git-harry Date: Fri, 14 Nov 2014 11:22:39 +0000 Subject: [PATCH] Remove deprecation warnings relating to api-paste Remove deprecation warnings and backwards compatibility introduced by commit c355d68a. This commit was introduce in havana and backported to grizzly. It relates to config options in api-paste.ini. This commit removes the following deprecated items: * cinder.api.auth:CinderKeystoneContext * cinder.api.auth:pipeline_factory * cinder.api.openstack:FaultWrapper * cinder.api.openstack.urlmap:urlmap_factory * cinder.api.openstack.volume:APIRouter * cinder.api.openstack.volume.versions.Versions * cinder.api.sizelimit:RequestBodySizeLimiter Change-Id: If7c055be0d257dee570da1db4adce2df6e73db14 --- cinder/api/auth.py | 37 ------------------------- cinder/api/openstack/__init__.py | 10 ------- cinder/api/openstack/urlmap.py | 28 ------------------- cinder/api/openstack/volume/__init__.py | 28 ------------------- cinder/api/openstack/volume/versions.py | 30 -------------------- cinder/api/sizelimit.py | 29 ------------------- 6 files changed, 162 deletions(-) delete mode 100644 cinder/api/auth.py delete mode 100644 cinder/api/openstack/urlmap.py delete mode 100644 cinder/api/openstack/volume/__init__.py delete mode 100644 cinder/api/openstack/volume/versions.py delete mode 100644 cinder/api/sizelimit.py diff --git a/cinder/api/auth.py b/cinder/api/auth.py deleted file mode 100644 index ca61179cf..000000000 --- a/cinder/api/auth.py +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2013 OpenStack Foundation -# -# 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 cinder.api.middleware import auth -from cinder.i18n import _ -from cinder.openstack.common import log as logging - - -LOG = logging.getLogger(__name__) - - -class CinderKeystoneContext(auth.CinderKeystoneContext): - def __init__(self, application): - LOG.warn(_('cinder.api.auth:CinderKeystoneContext is deprecated. ' - 'Please use ' - 'cinder.api.middleware.auth:CinderKeystoneContext ' - 'instead.')) - super(CinderKeystoneContext, self).__init__(application) - - -def pipeline_factory(loader, global_conf, **local_conf): - LOG.warn(_('cinder.api.auth:pipeline_factory is deprecated. Please use ' - 'cinder.api.middleware.auth:pipeline_factory instead.')) - auth.pipeline_factory(loader, global_conf, **local_conf) diff --git a/cinder/api/openstack/__init__.py b/cinder/api/openstack/__init__.py index 7cc1d1fa2..13f87c86b 100644 --- a/cinder/api/openstack/__init__.py +++ b/cinder/api/openstack/__init__.py @@ -128,13 +128,3 @@ class APIRouter(base_wsgi.Router): def _setup_routes(self, mapper, ext_mgr): raise NotImplementedError - - -class FaultWrapper(base_wsgi.Middleware): - - def __init__(self, application): - LOG.warn(_('cinder.api.openstack:FaultWrapper is deprecated. Please ' - 'use cinder.api.middleware.fault:FaultWrapper instead.')) - # Avoid circular imports from here. Can I just remove this class? - from cinder.api.middleware import fault - super(FaultWrapper, self).__init__(fault.FaultWrapper(application)) diff --git a/cinder/api/openstack/urlmap.py b/cinder/api/openstack/urlmap.py deleted file mode 100644 index 84b13c68f..000000000 --- a/cinder/api/openstack/urlmap.py +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (c) 2013 OpenStack Foundation -# -# 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 cinder.api import urlmap -from cinder.i18n import _ -from cinder.openstack.common import log as logging - - -LOG = logging.getLogger(__name__) - - -def urlmap_factory(loader, global_conf, **local_conf): - LOG.warn(_('cinder.api.openstack.urlmap:urlmap_factory is deprecated. ' - 'Please use cinder.api.urlmap:urlmap_factory instead.')) - urlmap.urlmap_factory(loader, global_conf, **local_conf) diff --git a/cinder/api/openstack/volume/__init__.py b/cinder/api/openstack/volume/__init__.py deleted file mode 100644 index e4a819d29..000000000 --- a/cinder/api/openstack/volume/__init__.py +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (c) 2013 OpenStack Foundation -# -# 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 cinder.api.v1.router import APIRouter as v1_router -from cinder.i18n import _ -from cinder.openstack.common import log as logging - -LOG = logging.getLogger(__name__) - - -class APIRouter(v1_router): - def __init__(self, ext_mgr=None): - LOG.warn(_('cinder.api.openstack.volume:APIRouter is deprecated. ' - 'Please use cinder.api.v1.router:APIRouter instead.')) - super(APIRouter, self).__init__(ext_mgr) diff --git a/cinder/api/openstack/volume/versions.py b/cinder/api/openstack/volume/versions.py deleted file mode 100644 index c403876a6..000000000 --- a/cinder/api/openstack/volume/versions.py +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2013 OpenStack Foundation -# -# 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 cinder.api import versions -from cinder.i18n import _ -from cinder.openstack.common import log as logging - - -LOG = logging.getLogger(__name__) - - -class Versions(versions.Versions): - def __init__(self): - LOG.warn(_('cinder.api.openstack.volume.versions.Versions is ' - 'deprecated. Please use cinder.api.versions.Versions ' - 'instead.')) - super(Versions, self).__init__() diff --git a/cinder/api/sizelimit.py b/cinder/api/sizelimit.py deleted file mode 100644 index 638432291..000000000 --- a/cinder/api/sizelimit.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2013 OpenStack Foundation -# -# 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 cinder.api.middleware import sizelimit -from cinder.i18n import _ -from cinder.openstack.common import log as logging - -LOG = logging.getLogger(__name__) - - -class RequestBodySizeLimiter(sizelimit.RequestBodySizeLimiter): - def __init__(self, *args, **kwargs): - LOG.warn(_('cinder.api.sizelimit:RequestBodySizeLimiter is ' - 'deprecated. Please use cinder.api.middleware.sizelimit:' - 'RequestBodySizeLimiter instead')) - super(RequestBodySizeLimiter, self).__init__(*args, **kwargs) -- 2.45.2