From ed39dd8b49203df8f7ddc1bf2bfd245abfd5a5e2 Mon Sep 17 00:00:00 2001 From: rajat29 Date: Wed, 7 Jun 2017 10:47:38 +0530 Subject: [PATCH] Use get_rpc_transport instead of get_transport With the added get_rpc_transport() function in oslo.messaging [1] and the recent version bump of oslo.messaging to 5.24.2, we can safely replace get_transport() with get_rpc_transport() which is much cleaner. [1] https://review.openstack.org/#/c/454194/ Related-Bug: #1680192 Change-Id: I3a3e88f0fc85a03c0ee9b82edd165436f136a4d0 --- magnum/common/rpc.py | 4 ++-- magnum/common/rpc_service.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/magnum/common/rpc.py b/magnum/common/rpc.py index ddce2b9834..2da24de4eb 100644 --- a/magnum/common/rpc.py +++ b/magnum/common/rpc.py @@ -52,8 +52,8 @@ EXTRA_EXMODS = [] def init(conf): global TRANSPORT, NOTIFIER exmods = get_allowed_exmods() - TRANSPORT = messaging.get_transport(conf, - allowed_remote_exmods=exmods) + TRANSPORT = messaging.get_rpc_transport(conf, + allowed_remote_exmods=exmods) serializer = RequestContextSerializer(JsonPayloadSerializer()) NOTIFIER = messaging.Notifier(TRANSPORT, serializer=serializer) diff --git a/magnum/common/rpc_service.py b/magnum/common/rpc_service.py index 427b448a73..27818d4ead 100644 --- a/magnum/common/rpc_service.py +++ b/magnum/common/rpc_service.py @@ -46,7 +46,7 @@ class Service(service.Service): def __init__(self, topic, server, handlers, binary): super(Service, self).__init__() serializer = _init_serializer() - transport = messaging.get_transport(CONF) + transport = messaging.get_rpc_transport(CONF) # TODO(asalkeld) add support for version='x.y' target = messaging.Target(topic=topic, server=server) self._server = messaging.get_rpc_server(transport, target, handlers, @@ -80,8 +80,8 @@ class API(object): serializer = _init_serializer() if transport is None: exmods = rpc.get_allowed_exmods() - transport = messaging.get_transport(CONF, - allowed_remote_exmods=exmods) + transport = messaging.get_rpc_transport( + CONF, allowed_remote_exmods=exmods) self._context = context if topic is None: topic = ''