Merge "remove old oslo.messaging transport aliases"

This commit is contained in:
Jenkins 2017-05-02 00:09:23 +00:00 committed by Gerrit Code Review
commit 4594c1becc
1 changed files with 3 additions and 18 deletions

View File

@ -22,8 +22,7 @@ __all__ = [
'RequestContextSerializer',
'get_client',
'get_server',
'get_notifier',
'TRANSPORT_ALIASES',
'get_notifier'
]
from oslo_config import cfg
@ -42,26 +41,12 @@ ALLOWED_EXMODS = [
]
EXTRA_EXMODS = []
# NOTE(flaper87): The meteos.openstack.common.rpc entries are
# for backwards compat with Havana rpc_backend configuration
# values. The meteos.rpc entries are for compat with Folsom values.
TRANSPORT_ALIASES = {
'meteos.openstack.common.rpc.impl_kombu': 'rabbit',
'meteos.openstack.common.rpc.impl_qpid': 'qpid',
'meteos.openstack.common.rpc.impl_zmq': 'zmq',
'meteos.rpc.impl_kombu': 'rabbit',
'meteos.rpc.impl_qpid': 'qpid',
'meteos.rpc.impl_zmq': 'zmq',
}
def init(conf):
global TRANSPORT, NOTIFIER
exmods = get_allowed_exmods()
TRANSPORT = messaging.get_transport(conf,
allowed_remote_exmods=exmods,
aliases=TRANSPORT_ALIASES)
allowed_remote_exmods=exmods)
serializer = RequestContextSerializer(JsonPayloadSerializer())
NOTIFIER = messaging.Notifier(TRANSPORT, serializer=serializer)
@ -124,7 +109,7 @@ class RequestContextSerializer(messaging.Serializer):
def get_transport_url(url_str=None):
return messaging.TransportURL.parse(CONF, url_str, TRANSPORT_ALIASES)
return messaging.TransportURL.parse(CONF, url_str)
def get_client(target, version_cap=None, serializer=None):