Remove deprecated cinder.middleware.sizelimit

This middleware has been deprecated since Kilo in favor of the
oslo.middleware.

Change-Id: I6cb2389d98492459661e4dd5d015ed87f5a784a3
This commit is contained in:
Mike Perez 2016-10-02 14:35:41 -07:00
parent 75b89a36e3
commit a55213bcd4
4 changed files with 6 additions and 43 deletions

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

View File

@ -16,7 +16,6 @@ import itertools
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
@ -201,7 +200,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,

View File

@ -0,0 +1,6 @@
---
upgrade:
- Removing deprecated file cinder.middleware.sizelimit. In your
api-paste.ini, replace
cinder.middleware.sizelimit:RequestBodySizeLimiter.factory with
oslo_middleware.sizelimit:RequestBodySizeLimiter.factory

View File

@ -65,7 +65,6 @@ oslo_messaging.notify.drivers =
cinder.openstack.common.notifier.test_notifier = oslo_messaging.notify._impl_test:TestDriver
# These are for backwards compatibility with Juno middleware configurations
oslo_middleware =
cinder.api.middleware.sizelimit = oslo_middleware.sizelimit
cinder.openstack.common.middleware.request_id = oslo_middleware.request_id
cinder.database.migration_backend =