diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-28 07:28:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-28 07:28:51 +0000 |
| commit | 34b1538af861693a4a311404e6ccad1ef87848a8 (patch) | |
| tree | a7901de3bd126461cf4e1bf26ec1de7521601883 | |
| parent | 7275349493712b350a30d602f08f3081aac04211 (diff) | |
| parent | 83c82beb86b85c95aa3db5e5acb55cac567ed70f (diff) | |
| download | trove-34b1538af861693a4a311404e6ccad1ef87848a8.tar.gz | |
Merge "get rid of a couple of old oslo-incubator object references"
| -rw-r--r-- | trove/rpc.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/trove/rpc.py b/trove/rpc.py index b8e826eb..03a63d21 100644 --- a/trove/rpc.py +++ b/trove/rpc.py @@ -27,7 +27,6 @@ __all__ = [ 'get_client', 'get_server', 'get_notifier', - 'TRANSPORT_ALIASES', ] @@ -50,23 +49,12 @@ ALLOWED_EXMODS = [ EXTRA_EXMODS = [] -# TODO(esp): Remove or update these paths -TRANSPORT_ALIASES = { - 'trove.openstack.common.rpc.impl_kombu': 'rabbit', - 'trove.openstack.common.rpc.impl_qpid': 'qpid', - 'trove.openstack.common.rpc.impl_zmq': 'zmq', - 'trove.rpc.impl_kombu': 'rabbit', - 'trove.rpc.impl_qpid': 'qpid', - 'trove.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) @@ -137,7 +125,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): |