From 1386ce690f3a76922c40c1f00e5a90e709c8f8e7 Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Mon, 20 Mar 2017 13:23:45 +0800 Subject: [PATCH] Remove old oslo.messaging transport aliases Those are remnants from the oslo-incubator times. Also, oslo.messaging deprecated [1] transport aliases since 5.2.0+ that is the minimal version supported for stable/newton. The patch that bumped the minimal version for Watcher landed 3 months+ ago, so we can proceed ripping those aliases from the code base. [1] I314cefa5fb1803fa7e21e3e34300e5ced31bba89 Change-Id: Ie3008cc54b0eb3d1d02f55f388bd1c3b109d126d Closes-Bug: #1424728 --- watcher/common/rpc.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/watcher/common/rpc.py b/watcher/common/rpc.py index c48cc974a..0905546b8 100644 --- a/watcher/common/rpc.py +++ b/watcher/common/rpc.py @@ -32,7 +32,6 @@ __all__ = [ 'get_client', 'get_server', 'get_notifier', - 'TRANSPORT_ALIASES', ] CONF = cfg.CONF @@ -46,16 +45,6 @@ ALLOWED_EXMODS = [ ] EXTRA_EXMODS = [] -# NOTE(lucasagomes): The watcher.openstack.common.rpc entries are for -# backwards compat with IceHouse rpc_backend configuration values. -TRANSPORT_ALIASES = { - 'watcher.openstack.common.rpc.impl_kombu': 'rabbit', - 'watcher.openstack.common.rpc.impl_qpid': 'qpid', - 'watcher.openstack.common.rpc.impl_zmq': 'zmq', - 'watcher.rpc.impl_kombu': 'rabbit', - 'watcher.rpc.impl_qpid': 'qpid', - 'watcher.rpc.impl_zmq': 'zmq', -} JsonPayloadSerializer = messaging.JsonPayloadSerializer @@ -64,12 +53,10 @@ def init(conf): global TRANSPORT, NOTIFICATION_TRANSPORT, NOTIFIER exmods = get_allowed_exmods() TRANSPORT = messaging.get_transport(conf, - allowed_remote_exmods=exmods, - aliases=TRANSPORT_ALIASES) + allowed_remote_exmods=exmods) NOTIFICATION_TRANSPORT = messaging.get_notification_transport( conf, - allowed_remote_exmods=exmods, - aliases=TRANSPORT_ALIASES) + allowed_remote_exmods=exmods) serializer = RequestContextSerializer(JsonPayloadSerializer()) if not conf.notification_level: