Merge "Remove LazySerializationMiddleware."

6 files changed, 2 insertions, 57 deletions

diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py
index f5ebdfee9..4789890c7 100644
--- a/nova/api/openstack/compute/extensions.py
+++ b/nova/api/openstack/compute/extensions.py
@@ -31,14 +31,3 @@ class ExtensionManager(base_extensions.ExtensionManager):
         self.cls_list = FLAGS.osapi_compute_extension
         self.extensions = {}
         self._load_extensions()
-
-
-class ExtensionMiddleware(base_extensions.ExtensionMiddleware):
-    """Extensions middleware for WSGI.
-
-    Provided only for backwards compatibility with existing
-    api-paste.ini files.  This middleware will be removed in future
-    versions of nova.
-    """
-
-    pass
diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index b40920f40..417979f90 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -174,18 +174,6 @@ class ExtensionsResource(wsgi.Resource):
         raise webob.exc.HTTPNotFound()
 
 
-@utils.deprecated("The extension middleware is no longer necessary.")
-class ExtensionMiddleware(base_wsgi.Middleware):
-    """Extensions middleware for WSGI.
-
-    Provided only for backwards compatibility with existing
-    api-paste.ini files.  This middleware will be removed in future
-    versions of nova.
-    """
-
-    pass
-
-
 class ExtensionManager(object):
     """Load extensions from the configured extension path.
 
diff --git a/nova/api/openstack/volume/extensions.py b/nova/api/openstack/volume/extensions.py
index eccac660e..f07420182 100644
--- a/nova/api/openstack/volume/extensions.py
+++ b/nova/api/openstack/volume/extensions.py
@@ -31,14 +31,3 @@ class ExtensionManager(base_extensions.ExtensionManager):
         self.cls_list = FLAGS.osapi_volume_extension
         self.extensions = {}
         self._load_extensions()
-
-
-class ExtensionMiddleware(base_extensions.ExtensionMiddleware):
-    """Extensions middleware for WSGI.
-
-    Provided only for backwards compatibility with existing
-    api-paste.ini files.  This middleware will be removed in future
-    versions of nova.
-    """
-
-    pass
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index 26f6cc97f..50f693f49 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -337,18 +337,6 @@ class XMLDictSerializer(DictSerializer):
         return etree.tostring(root, encoding='UTF-8', xml_declaration=True)
 
 
-@utils.deprecated("The lazy serialization middleware is no longer necessary.")
-class LazySerializationMiddleware(wsgi.Middleware):
-    """Lazy serialization middleware.
-
-    Provided only for backwards compatibility with existing
-    api-paste.ini files.  This middleware will be removed in future
-    versions of nova.
-    """
-
-    pass
-
-
 def serializers(**serializers):
     """Attaches serializers to a method.
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py
index fca5f309f..d168e36fe 100644
--- a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py
+++ b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py
@@ -176,11 +176,7 @@ class CreateBackupTests(test.TestCase):
 
         self.stubs.Set(compute.API, 'get', fake_compute_api_get)
         self.backup_stubs = fakes.stub_out_compute_api_backup(self.stubs)
-
-        router = compute_api.APIRouter()
-        ext_middleware = extensions.ExtensionMiddleware(router)
-        self.app = wsgi.LazySerializationMiddleware(ext_middleware)
-
+        self.app = compute_api.APIRouter()
         self.uuid = utils.gen_uuid()
 
     def _get_request(self, body):
diff --git a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py b/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py
index 7185873a7..167d46d02 100644
--- a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py
+++ b/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py
@@ -32,13 +32,8 @@ class SchedulerHintsTestCase(test.TestCase):
 
     def setUp(self):
         super(SchedulerHintsTestCase, self).setUp()
-
         self.fake_instance = fakes.stub_instance(1, uuid=UUID)
-
-        app = compute.APIRouter()
-        app = extensions.ExtensionMiddleware(app)
-        app = wsgi.LazySerializationMiddleware(app)
-        self.app = app
+        self.app = compute.APIRouter()
 
     def test_create_server_without_hints(self):