From a55213bcd4b9fac1d539722184fef59967408d91 Mon Sep 17 00:00:00 2001
From: Mike Perez <thingee@gmail.com>
Date: Sun, 2 Oct 2016 14:35:41 -0700
Subject: [PATCH] Remove deprecated cinder.middleware.sizelimit

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

Change-Id: I6cb2389d98492459661e4dd5d015ed87f5a784a3
---
 cinder/api/middleware/sizelimit.py            | 40 -------------------
 cinder/opts.py                                |  2 -
 ...middleware-sizelimit-ba86907acbda83de.yaml |  6 +++
 setup.cfg                                     |  1 -
 4 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 cinder/api/middleware/sizelimit.py
 create mode 100644 cinder/releasenotes/notes/removing-middleware-sizelimit-ba86907acbda83de.yaml

diff --git a/cinder/api/middleware/sizelimit.py b/cinder/api/middleware/sizelimit.py
deleted file mode 100644
index 27813655582..00000000000
--- a/cinder/api/middleware/sizelimit.py
+++ /dev/null
@@ -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
diff --git a/cinder/opts.py b/cinder/opts.py
index e1b9176f8d8..a05399e2fef 100644
--- a/cinder/opts.py
+++ b/cinder/opts.py
@@ -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,
diff --git a/cinder/releasenotes/notes/removing-middleware-sizelimit-ba86907acbda83de.yaml b/cinder/releasenotes/notes/removing-middleware-sizelimit-ba86907acbda83de.yaml
new file mode 100644
index 00000000000..19a36a1e594
--- /dev/null
+++ b/cinder/releasenotes/notes/removing-middleware-sizelimit-ba86907acbda83de.yaml
@@ -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
diff --git a/setup.cfg b/setup.cfg
index 4eb017deab7..dbe589ae87f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -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 =