From 58a13e38a41e026840255ddcb5c382003832f3c5 Mon Sep 17 00:00:00 2001
From: Bradley Jones <jones.bradley@me.com>
Date: Wed, 27 May 2015 05:40:46 +0100
Subject: [PATCH] Only define RequestContextSerializer once

rpc_service.py is already importing rpc.py so it should reuse
RequestContextSerializer rather than redefining it.

Change-Id: Ie8a6deca7e7c238b8076a8bbbe9598a025222aa1
Closes-Bug: #1459090
---
 magnum/common/rpc.py         |  2 +-
 magnum/common/rpc_service.py | 27 ++-------------------------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/magnum/common/rpc.py b/magnum/common/rpc.py
index 39a27b97c2..516567b89f 100644
--- a/magnum/common/rpc.py
+++ b/magnum/common/rpc.py
@@ -112,7 +112,7 @@ class RequestContextSerializer(messaging.Serializer):
         return self._base.deserialize_entity(context, entity)
 
     def serialize_context(self, context):
-        return context
+        return context.to_dict()
 
     def deserialize_context(self, context):
         return magnum_context.RequestContext.from_dict(context)
diff --git a/magnum/common/rpc_service.py b/magnum/common/rpc_service.py
index 9fafd27cb4..416f360299 100644
--- a/magnum/common/rpc_service.py
+++ b/magnum/common/rpc_service.py
@@ -18,7 +18,6 @@ import eventlet
 from oslo_config import cfg
 import oslo_messaging as messaging
 
-from magnum.common import context as magnum_context
 from magnum.common import rpc
 from magnum.objects import base as objects_base
 
@@ -40,33 +39,11 @@ TRANSPORT_ALIASES = {
 }
 
 
-class RequestContextSerializer(messaging.Serializer):
-
-    def __init__(self, base):
-        self._base = base
-
-    def serialize_entity(self, context, entity):
-        if not self._base:
-            return entity
-        return self._base.serialize_entity(context, entity)
-
-    def deserialize_entity(self, context, entity):
-        if not self._base:
-            return entity
-        return self._base.deserialize_entity(context, entity)
-
-    def serialize_context(self, context):
-        return context.to_dict()
-
-    def deserialize_context(self, context):
-        return magnum_context.RequestContext.from_dict(context)
-
-
 class Service(object):
     _server = None
 
     def __init__(self, topic, server, handlers):
-        serializer = RequestContextSerializer(
+        serializer = rpc.RequestContextSerializer(
             objects_base.MagnumObjectSerializer())
         transport = messaging.get_transport(cfg.CONF,
                                             aliases=TRANSPORT_ALIASES)
@@ -83,7 +60,7 @@ class Service(object):
 class API(object):
     def __init__(self, transport=None, context=None, topic=None, server=None,
                  timeout=None):
-        serializer = RequestContextSerializer(
+        serializer = rpc.RequestContextSerializer(
             objects_base.MagnumObjectSerializer())
         if transport is None:
             exmods = rpc.get_allowed_exmods()