diff options
| author | Amrith Kumar <amrith@amrith.org> | 2016-11-07 16:35:09 -0500 |
|---|---|---|
| committer | Amrith Kumar <amrith@amrith.org> | 2016-12-21 16:34:04 -0500 |
| commit | 83c82beb86b85c95aa3db5e5acb55cac567ed70f (patch) | |
| tree | 796482dbaae17526a338ce6fe3bd41fee4de641e /trove | |
| parent | 1b2f42dc3d7290d92f8203587a0adcfbd146e00f (diff) | |
| download | trove-83c82beb86b85c95aa3db5e5acb55cac567ed70f.tar.gz | |
get rid of a couple of old oslo-incubator object references
Found these while looking around the rpc message code; these paths are
no longer valid. Didn't want to combine this change with the one to
add signing/verification as it appears to be more of a cleanup thing.
TRANSPORT_ALIASES is no longer used so I've got rid of that as well.
Change-Id: I398f1286bcb08740a6125d4e773c9de6708e1d43
Diffstat (limited to 'trove')
| -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): |