From e03d3d2ebef82a43188e8e2a38d658ad0aa24121 Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Fri, 6 May 2016 15:32:47 -0400 Subject: [PATCH] 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 --- manila/api/middleware/sizelimit.py | 35 ------------------- manila/api/sizelimit.py | 33 ----------------- ...recated-size-limiter-9d7c8ab69cf85aea.yaml | 10 ++++++ 3 files changed, 10 insertions(+), 68 deletions(-) delete mode 100644 manila/api/middleware/sizelimit.py delete mode 100644 manila/api/sizelimit.py create mode 100644 releasenotes/notes/remove-deprecated-size-limiter-9d7c8ab69cf85aea.yaml diff --git a/manila/api/middleware/sizelimit.py b/manila/api/middleware/sizelimit.py deleted file mode 100644 index 0a84ed9b72..0000000000 --- a/manila/api/middleware/sizelimit.py +++ /dev/null @@ -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) diff --git a/manila/api/sizelimit.py b/manila/api/sizelimit.py deleted file mode 100644 index 305d81d3c3..0000000000 --- a/manila/api/sizelimit.py +++ /dev/null @@ -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) diff --git a/releasenotes/notes/remove-deprecated-size-limiter-9d7c8ab69cf85aea.yaml b/releasenotes/notes/remove-deprecated-size-limiter-9d7c8ab69cf85aea.yaml new file mode 100644 index 0000000000..138321898c --- /dev/null +++ b/releasenotes/notes/remove-deprecated-size-limiter-9d7c8ab69cf85aea.yaml @@ -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 +