Use oslo_messaging for JsonPayloadSerializer

JsonPayloadSerializer is added in oslo_messaging lib.
This patch suggest to replace current one with oslo_messaging.

Change-Id: I8880ae628b6121e2aee0d132238f44571f3168e3

1 files changed, 6 insertions, 10 deletions

diff --git a/heat/common/messaging.py b/heat/common/messaging.py
index fefbadcdd..44ef904f5 100644
--- a/heat/common/messaging.py
+++ b/heat/common/messaging.py
@@ -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)