Merge "Remove old oslo.messaging transport aliases"

This commit is contained in:
Jenkins 2017-05-22 15:53:34 +00:00 committed by Gerrit Code Review
commit 50b3e63069
1 changed files with 2 additions and 17 deletions

View File

@ -23,7 +23,6 @@ __all__ = [
'get_client',
'get_server',
'get_notifier',
'TRANSPORT_ALIASES',
]
@ -58,25 +57,11 @@ ALLOWED_EXMODS = [
EXTRA_EXMODS = []
# NOTE(flaper87): The designate.openstack.common.rpc entries are
# for backwards compat with Havana rpc_backend configuration
# values. The designate.rpc entries are for compat with Folsom values.
TRANSPORT_ALIASES = {
'designate.openstack.common.rpc.impl_kombu': 'rabbit',
'designate.openstack.common.rpc.impl_qpid': 'qpid',
'designate.openstack.common.rpc.impl_zmq': 'zmq',
'designate.rpc.impl_kombu': 'rabbit',
'designate.rpc.impl_qpid': 'qpid',
'designate.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)
@ -186,7 +171,7 @@ class RPCDispatcher(rpc_dispatcher.RPCDispatcher):
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):