openstack
/
manila
Code Issues Proposed changes

Remove deprecated manila RequestBodySizeLimiter 

In kilo, the manila  functionality for limiting request body size was
was moved to oslo.middleware library [1] and compatibility shims and
deprecation log messages were added for the manila
RequestBodySizeLimiter, whose function had been superceded by the
equivalent oslo library object.

It has now been more than two releases since the deprecation so
this commit removes the compatibility shims and log messages.

[1] I10c3cbeb9d43b504f14375df4dac87b323fab5bf

Change-Id: I01cc6585c15af9b13b178e26d4b469825dbd562c
This commit is contained in:
Tom Barron 2016-05-06 15:32:47 -04:00
parent 06eac60406
commit e03d3d2ebe
3 changed files with 10 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
manila/api/middleware/sizelimit.py
View File

@ -1,35 +0,0 @@
# Copyright (c) 2012 OpenStack, LLC
#
# 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.
"""
from oslo_log import log
from oslo_middleware import sizelimit
from manila.i18n import _LW
LOG = log.getLogger(__name__)
class RequestBodySizeLimiter(sizelimit.RequestBodySizeLimiter):
def __init__(self, *args, **kwargs):
LOG.warning(_LW('manila.api.sizelimit:RequestBodySizeLimiter and '
'manila.api.middleware.sizelimit:'
'RequestBodySizeLimiter '
'are deprecated. Please use '
'oslo_middleware.sizelimit: '
'RequestBodySizeLimiter instead.'))
super(RequestBodySizeLimiter, self).__init__(*args, **kwargs)

33
manila/api/sizelimit.py
View File

@ -1,33 +0,0 @@
# Copyright (c) 2013 OpenStack, LLC.
#
# 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 oslo_log import log
from oslo_middleware import sizelimit
from manila.i18n import _LW
LOG = log.getLogger(__name__)
class RequestBodySizeLimiter(sizelimit.RequestBodySizeLimiter):
def __init__(self, *args, **kwargs):
LOG.warning(_LW('manila.api.sizelimit:RequestBodySizeLimiter and '
'manila.api.middleware.sizelimit:'
'RequestBodySizeLimiter '
'are deprecated. Please use '
'oslo_middleware.sizelimit: '
'RequestBodySizeLimiter instead.'))
super(RequestBodySizeLimiter, self).__init__(*args, **kwargs)

10
releasenotes/notes/remove-deprecated-size-limiter-9d7c8ab69cf85aea.yaml Normal file
View File

@ -0,0 +1,10 @@
deprecations:
- Removed manila RequestBodySizeLimiter shims and deprecation
log messages since it has been deprecated since equivalent
oslo.middleware library object was added in kilo.
upgrade:
- Ensure that /etc/manila/api-paste.ini is up-to-date with
etc/manila/api-paste.ini, in particular that [filter:sizelimit]
section has
paste.filter_factory = oslo_middleware.sizelimit:RequestBodySizeLimiter.factory