From 5fcfdc2bdac910285eed80f09117d415e35f167b Mon Sep 17 00:00:00 2001 From: Michael Dovgal Date: Fri, 30 Dec 2016 15:21:33 +0000 Subject: [PATCH] Remove deprecated RequestBodySizeLimiter class This class was moved to oslo_middleware and marked as deprecated in Kilo and marked to be removed in Ocata release. Change-Id: I35d7e35f34a90f13b46ed16735c16328a83a1b8f Closes-Bug: #1588406 --- cinder/api/middleware/sizelimit.py | 40 ------------------- cinder/opts.py | 2 - ...ve-deprecated-option-98912ab7e8b472e8.yaml | 4 ++ 3 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 cinder/api/middleware/sizelimit.py create mode 100644 releasenotes/notes/cinder-api-middleware-remove-deprecated-option-98912ab7e8b472e8.yaml diff --git a/cinder/api/middleware/sizelimit.py b/cinder/api/middleware/sizelimit.py deleted file mode 100644 index 27813655582..00000000000 --- a/cinder/api/middleware/sizelimit.py +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) 2012 OpenStack Foundation -# -# 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. -""" -Request Body limiting middleware. -Compatibility shim for Kilo, while operators migrate to oslo.middleware. -""" -# TODO(tbarron): remove this shim in Ocata. Note that although the shim -# was added in Kilo, api-paste.ini was not converted to use oslo.middleware -# until Newton. - -from oslo_config import cfg -from oslo_log import versionutils -from oslo_middleware import sizelimit - - -# Default request size is 112k -max_request_body_size_opt = cfg.IntOpt('osapi_max_request_body_size', - default=114688, - help='Max size for body of a request') - -CONF = cfg.CONF -CONF.register_opt(max_request_body_size_opt) - - -@versionutils.deprecated(as_of=versionutils.deprecated.KILO, - in_favor_of='oslo_middleware.RequestBodySizeLimiter') -class RequestBodySizeLimiter(sizelimit.RequestBodySizeLimiter): - """Add a 'cinder.context' to WSGI environ.""" - pass diff --git a/cinder/opts.py b/cinder/opts.py index 32d1ef162f1..b43264ac920 100644 --- a/cinder/opts.py +++ b/cinder/opts.py @@ -19,7 +19,6 @@ objects.register_all() from cinder.api import common as cinder_api_common from cinder.api.middleware import auth as cinder_api_middleware_auth -from cinder.api.middleware import sizelimit as cinder_api_middleware_sizelimit from cinder.api.views import versions as cinder_api_views_versions from cinder.backup import api as cinder_backup_api from cinder.backup import chunkeddriver as cinder_backup_chunkeddriver @@ -214,7 +213,6 @@ def list_opts(): itertools.chain( cinder_api_common.api_common_opts, [cinder_api_middleware_auth.use_forwarded_for_opt], - [cinder_api_middleware_sizelimit.max_request_body_size_opt], cinder_api_views_versions.versions_opts, cinder_backup_api.backup_api_opts, cinder_backup_chunkeddriver.chunkedbackup_service_opts, diff --git a/releasenotes/notes/cinder-api-middleware-remove-deprecated-option-98912ab7e8b472e8.yaml b/releasenotes/notes/cinder-api-middleware-remove-deprecated-option-98912ab7e8b472e8.yaml new file mode 100644 index 00000000000..1816cfa0a06 --- /dev/null +++ b/releasenotes/notes/cinder-api-middleware-remove-deprecated-option-98912ab7e8b472e8.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - Removed deprecated option 'max_request_body_size_opt' + in api.middleware.