diff --git a/sahara/tests/unit/utils/test_rpc.py b/sahara/tests/unit/utils/test_rpc.py index 4cb6c8acee..6b1f9ca6a3 100644 --- a/sahara/tests/unit/utils/test_rpc.py +++ b/sahara/tests/unit/utils/test_rpc.py @@ -19,12 +19,6 @@ from sahara import main from sahara.tests.unit import base from sahara.utils import rpc as messaging -_ALIASES = { - 'sahara.openstack.common.rpc.impl_kombu': 'rabbit', - 'sahara.openstack.common.rpc.impl_qpid': 'qpid', - 'sahara.openstack.common.rpc.impl_zmq': 'zmq', -} - class TestMessagingSetup(base.SaharaTestCase): def setUp(self): @@ -67,10 +61,10 @@ class TestMessagingSetup(base.SaharaTestCase): ] self.assertEqual(expected, self.set_transport_def.call_args_list) self.assertEqual( - [mock.call(main.CONF, aliases=_ALIASES)], + [mock.call(main.CONF)], self.get_transport.call_args_list) self.assertEqual( - [mock.call(main.CONF, aliases=_ALIASES)], + [mock.call(main.CONF)], self.get_notify_transport.call_args_list) self.assertEqual(1, self.notifier_init.call_count) @@ -89,10 +83,10 @@ class TestMessagingSetup(base.SaharaTestCase): ] self.assertEqual(expected, self.set_transport_def.call_args_list) self.assertEqual( - [mock.call(main.CONF, aliases=_ALIASES)], + [mock.call(main.CONF)], self.get_transport.call_args_list) self.assertEqual( - [mock.call(main.CONF, aliases=_ALIASES)], + [mock.call(main.CONF)], self.get_notify_transport.call_args_list) self.assertEqual(1, self.notifier_init.call_count) diff --git a/sahara/utils/rpc.py b/sahara/utils/rpc.py index 202fac1383..f922c3d996 100644 --- a/sahara/utils/rpc.py +++ b/sahara/utils/rpc.py @@ -31,12 +31,6 @@ NOTIFIER = None CONF = cfg.CONF LOG = logging.getLogger(__name__) -_ALIASES = { - 'sahara.openstack.common.rpc.impl_kombu': 'rabbit', - 'sahara.openstack.common.rpc.impl_qpid': 'qpid', - 'sahara.openstack.common.rpc.impl_zmq': 'zmq', -} - class ContextSerializer(messaging.Serializer): def __init__(self, base): @@ -102,14 +96,14 @@ def setup_service_messaging(): if MESSAGING_TRANSPORT: # Already is up return - MESSAGING_TRANSPORT = messaging.get_transport(cfg.CONF, aliases=_ALIASES) + MESSAGING_TRANSPORT = messaging.get_transport(cfg.CONF) def setup_notifications(): global NOTIFICATION_TRANSPORT, NOTIFIER, MESSAGING_TRANSPORT try: NOTIFICATION_TRANSPORT = \ - messaging.get_notification_transport(cfg.CONF, aliases=_ALIASES) + messaging.get_notification_transport(cfg.CONF) except Exception: LOG.error(_LE("Unable to setup notification transport. Reusing " "service transport for that."))