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 +