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
This commit is contained in:
parent
1fd7c43817
commit
58a13e38a4
|
@ -112,7 +112,7 @@ class RequestContextSerializer(messaging.Serializer):
|
||||||
return self._base.deserialize_entity(context, entity)
|
return self._base.deserialize_entity(context, entity)
|
||||||
|
|
||||||
def serialize_context(self, context):
|
def serialize_context(self, context):
|
||||||
return context
|
return context.to_dict()
|
||||||
|
|
||||||
def deserialize_context(self, context):
|
def deserialize_context(self, context):
|
||||||
return magnum_context.RequestContext.from_dict(context)
|
return magnum_context.RequestContext.from_dict(context)
|
||||||
|
|
|
@ -18,7 +18,6 @@ import eventlet
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
import oslo_messaging as messaging
|
import oslo_messaging as messaging
|
||||||
|
|
||||||
from magnum.common import context as magnum_context
|
|
||||||
from magnum.common import rpc
|
from magnum.common import rpc
|
||||||
from magnum.objects import base as objects_base
|
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):
|
class Service(object):
|
||||||
_server = None
|
_server = None
|
||||||
|
|
||||||
def __init__(self, topic, server, handlers):
|
def __init__(self, topic, server, handlers):
|
||||||
serializer = RequestContextSerializer(
|
serializer = rpc.RequestContextSerializer(
|
||||||
objects_base.MagnumObjectSerializer())
|
objects_base.MagnumObjectSerializer())
|
||||||
transport = messaging.get_transport(cfg.CONF,
|
transport = messaging.get_transport(cfg.CONF,
|
||||||
aliases=TRANSPORT_ALIASES)
|
aliases=TRANSPORT_ALIASES)
|
||||||
|
@ -83,7 +60,7 @@ class Service(object):
|
||||||
class API(object):
|
class API(object):
|
||||||
def __init__(self, transport=None, context=None, topic=None, server=None,
|
def __init__(self, transport=None, context=None, topic=None, server=None,
|
||||||
timeout=None):
|
timeout=None):
|
||||||
serializer = RequestContextSerializer(
|
serializer = rpc.RequestContextSerializer(
|
||||||
objects_base.MagnumObjectSerializer())
|
objects_base.MagnumObjectSerializer())
|
||||||
if transport is None:
|
if transport is None:
|
||||||
exmods = rpc.get_allowed_exmods()
|
exmods = rpc.get_allowed_exmods()
|
||||||
|
|
Loading…
Reference in New Issue