Serialize properly

2 files changed, 4 insertions, 3 deletions

diff --git a/nova/api/rackspace/base.py b/nova/api/rackspace/base.py
index c85fd7b8e..b995d9acc 100644
--- a/nova/api/rackspace/base.py
+++ b/nova/api/rackspace/base.py
@@ -36,4 +36,5 @@ class Controller(wsgi.Controller):
         MIME types to information needed to serialize to that type.
         """
         _metadata = getattr(type(self), "_serialization_metadata", {})
-        return Serializer(request.environ, _metadata).to_content_type(data)
+        serializer = wsgi.Serializer(request.environ, _metadata)
+        return serializer.to_content_type(data)
diff --git a/nova/api/rackspace/images.py b/nova/api/rackspace/images.py
index c9cc8e85d..62e0b24c5 100644
--- a/nova/api/rackspace/images.py
+++ b/nova/api/rackspace/images.py
@@ -56,12 +56,12 @@ class Controller(base.Controller):
         """Return all public images."""
         data = dict((self._to_rs_id(id), val) 
                     for id, val in self._svc.index().iteritems())
-        return dict(images=data)
+        return self.serialize(dict(images=data), req)
 
     def show(self, req, id):
         """Return data about the given image id."""
         opaque_id = self._from_rs_id(id)
-        return dict(image=self._svc.show(opaque_id))
+        return self.serialize(dict(image=self._svc.show(opaque_id)), req)
 
     def delete(self, req, id):
         # Only public images are supported for now.