Merge "Use oslo_messaging for JsonPayloadSerializer"

This commit is contained in:
Zuul 2018-09-10 23:47:07 +00:00 committed by Gerrit Code Review
commit c18cf79595
1 changed files with 6 additions and 10 deletions

View File

@ -17,7 +17,6 @@ import eventlet
from oslo_config import cfg
import oslo_messaging
from oslo_messaging.rpc import dispatcher
from oslo_serialization import jsonutils
from osprofiler import profiler
from heat.common import context
@ -63,12 +62,6 @@ class RequestContextSerializer(oslo_messaging.Serializer):
return context.RequestContext.from_dict(ctxt)
class JsonPayloadSerializer(oslo_messaging.NoOpSerializer):
@classmethod
def serialize_entity(cls, context, entity):
return jsonutils.to_primitive(entity, convert_instances=True)
def get_specific_transport(url, optional, exmods, is_for_notifications=False):
try:
if is_for_notifications:
@ -112,7 +105,8 @@ def setup(url=None, optional=False):
TRANSPORT._driver._exchange_manager._exchanges = {}
if not NOTIFIER and NOTIFICATIONS_TRANSPORT:
serializer = RequestContextSerializer(JsonPayloadSerializer())
serializer = RequestContextSerializer(
oslo_messaging.JsonPayloadSerializer())
NOTIFIER = oslo_messaging.Notifier(NOTIFICATIONS_TRANSPORT,
serializer=serializer)
@ -128,7 +122,8 @@ def cleanup():
def get_rpc_server(target, endpoint):
"""Return a configured oslo_messaging rpc server."""
serializer = RequestContextSerializer(JsonPayloadSerializer())
serializer = RequestContextSerializer(
oslo_messaging.JsonPayloadSerializer())
access_policy = dispatcher.DefaultRPCAccessPolicy
return oslo_messaging.get_rpc_server(TRANSPORT, target, [endpoint],
executor='eventlet',
@ -139,7 +134,8 @@ def get_rpc_server(target, endpoint):
def get_rpc_client(**kwargs):
"""Return a configured oslo_messaging RPCClient."""
target = oslo_messaging.Target(**kwargs)
serializer = RequestContextSerializer(JsonPayloadSerializer())
serializer = RequestContextSerializer(
oslo_messaging.JsonPayloadSerializer())
return oslo_messaging.RPCClient(TRANSPORT, target,
serializer=serializer)