openstack
/
magnum
Code Issues Proposed changes

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:
Bradley Jones 2015-05-27 05:40:46 +01:00
parent 1fd7c43817
commit 58a13e38a4
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/common/rpc.py
View File

@ -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)

27
magnum/common/rpc_service.py
View File

@ -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()