summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 16:14:28 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 16:14:28 +0000
commit907415c984e95e09a8b872f3c551ae6108c91de1 (patch)
tree8380434104bc8d71da55d864cb0b086b6bbc6758
parent05f474cdc6a2cc4e4276705f35aa83ba2f407014 (diff)
parented39dd8b49203df8f7ddc1bf2bfd245abfd5a5e2 (diff)
Merge "Use get_rpc_transport instead of get_transport"
-rw-r--r--magnum/common/rpc.py4
-rw-r--r--magnum/common/rpc_service.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/magnum/common/rpc.py b/magnum/common/rpc.py
index ddce2b9..2da24de 100644
--- a/magnum/common/rpc.py
+++ b/magnum/common/rpc.py
@@ -52,8 +52,8 @@ EXTRA_EXMODS = []
52def init(conf): 52def init(conf):
53 global TRANSPORT, NOTIFIER 53 global TRANSPORT, NOTIFIER
54 exmods = get_allowed_exmods() 54 exmods = get_allowed_exmods()
55 TRANSPORT = messaging.get_transport(conf, 55 TRANSPORT = messaging.get_rpc_transport(conf,
56 allowed_remote_exmods=exmods) 56 allowed_remote_exmods=exmods)
57 serializer = RequestContextSerializer(JsonPayloadSerializer()) 57 serializer = RequestContextSerializer(JsonPayloadSerializer())
58 NOTIFIER = messaging.Notifier(TRANSPORT, serializer=serializer) 58 NOTIFIER = messaging.Notifier(TRANSPORT, serializer=serializer)
59 59
diff --git a/magnum/common/rpc_service.py b/magnum/common/rpc_service.py
index 427b448..27818d4 100644
--- a/magnum/common/rpc_service.py
+++ b/magnum/common/rpc_service.py
@@ -46,7 +46,7 @@ class Service(service.Service):
46 def __init__(self, topic, server, handlers, binary): 46 def __init__(self, topic, server, handlers, binary):
47 super(Service, self).__init__() 47 super(Service, self).__init__()
48 serializer = _init_serializer() 48 serializer = _init_serializer()
49 transport = messaging.get_transport(CONF) 49 transport = messaging.get_rpc_transport(CONF)
50 # TODO(asalkeld) add support for version='x.y' 50 # TODO(asalkeld) add support for version='x.y'
51 target = messaging.Target(topic=topic, server=server) 51 target = messaging.Target(topic=topic, server=server)
52 self._server = messaging.get_rpc_server(transport, target, handlers, 52 self._server = messaging.get_rpc_server(transport, target, handlers,
@@ -80,8 +80,8 @@ class API(object):
80 serializer = _init_serializer() 80 serializer = _init_serializer()
81 if transport is None: 81 if transport is None:
82 exmods = rpc.get_allowed_exmods() 82 exmods = rpc.get_allowed_exmods()
83 transport = messaging.get_transport(CONF, 83 transport = messaging.get_rpc_transport(
84 allowed_remote_exmods=exmods) 84 CONF, allowed_remote_exmods=exmods)
85 self._context = context 85 self._context = context
86 if topic is None: 86 if topic is None:
87 topic = '' 87 topic = ''