openstack
/
cinder
Code Issues Proposed changes

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
This commit is contained in:
Michael Dovgal 2016-12-30 15:21:33 +00:00
parent ffb5eef8c8
commit 5fcfdc2bda
3 changed files with 4 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cinder/api/middleware/sizelimit.py
View File

@ -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

2
cinder/opts.py
View File

@ -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,

4
releasenotes/notes/cinder-api-middleware-remove-deprecated-option-98912ab7e8b472e8.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- Removed deprecated option 'max_request_body_size_opt'
in api.middleware.