Merge "Remove deprecated serialization code."

4 files changed, 7 insertions, 29 deletions

diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py
index 717f66fd0..9e0509e71 100644
--- a/nova/api/openstack/compute/__init__.py
+++ b/nova/api/openstack/compute/__init__.py
@@ -77,9 +77,7 @@ class APIRouter(base_wsgi.Router):
             LOG.debug(_('Extended resource: %s'),
                       resource.collection)
 
-            wsgi_resource = wsgi.Resource(
-                resource.controller, resource.deserializer,
-                resource.serializer)
+            wsgi_resource = wsgi.Resource(resource.controller)
             self.resources[resource.collection] = wsgi_resource
             kargs = dict(
                 controller=wsgi_resource,
diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index 9a47a69d4..4b8da21ed 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -305,8 +305,7 @@ class ResourceExtension(object):
     """Add top level resources to the OpenStack API in nova."""
 
     def __init__(self, collection, controller, parent=None,
-                 collection_actions=None, member_actions=None,
-                 deserializer=None, serializer=None):
+                 collection_actions=None, member_actions=None):
         if not collection_actions:
             collection_actions = {}
         if not member_actions:
@@ -316,8 +315,6 @@ class ResourceExtension(object):
         self.parent = parent
         self.collection_actions = collection_actions
         self.member_actions = member_actions
-        self.deserializer = deserializer
-        self.serializer = serializer
 
 
 def wrap_errors(fn):
diff --git a/nova/api/openstack/volume/__init__.py b/nova/api/openstack/volume/__init__.py
index f8d0f28bd..efc2111ab 100644
--- a/nova/api/openstack/volume/__init__.py
+++ b/nova/api/openstack/volume/__init__.py
@@ -66,9 +66,7 @@ class APIRouter(base_wsgi.Router):
             LOG.debug(_('Extended resource: %s'),
                       resource.collection)
 
-            wsgi_resource = wsgi.Resource(
-                resource.controller, resource.deserializer,
-                resource.serializer)
+            wsgi_resource = wsgi.Resource(resource.controller)
             self.resources[resource.collection] = wsgi_resource
             kargs = dict(
                 controller=wsgi_resource,
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index d5a3d95b3..bcb64c98a 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -604,21 +604,14 @@ class Resource(wsgi.Application):
 
     """
 
-    def __init__(self, controller, deserializer=None, serializer=None,
-                 action_peek=None, **deserializers):
+    def __init__(self, controller, action_peek=None, **deserializers):
         """
         :param controller: object that implement methods created by routes lib
-        :param deserializer: object that can serialize the output of a
-                             controller into a webob response
-        :param serializer: object that can deserialize a webob request
-                           into necessary pieces
         :param action_peek: dictionary of routines for peeking into an action
                             request body to determine the desired action
         """
 
         self.controller = controller
-        self.deserializer = deserializer
-        self.serializer = serializer
 
         default_deserializers = dict(xml=XMLDeserializer,
                                      json=JSONDeserializer)
@@ -811,9 +804,7 @@ class Resource(wsgi.Application):
 
         # Now, deserialize the request body...
         try:
-            if self.deserializer is not None:
-                contents = self.deserializer.deserialize_body(request, action)
-            elif content_type is not None:
+            if content_type:
                 contents = self.deserialize(meth, content_type, body)
             else:
                 contents = {}
@@ -869,14 +860,8 @@ class Resource(wsgi.Application):
                                                         request, action_args)
 
             if resp_obj and not response:
-                if self.serializer:
-                    response = self.serializer.serialize(request,
-                                                         resp_obj.obj,
-                                                         accept,
-                                                         action=action)
-                else:
-                    response = resp_obj.serialize(request, accept,
-                                                  self.default_serializers)
+                response = resp_obj.serialize(request, accept,
+                                              self.default_serializers)
 
         try:
             msg_dict = dict(url=request.url, status=response.status_int)