diff --git a/nova/cells/rpc_driver.py b/nova/cells/rpc_driver.py index 898f135ca9c8..7a26e3f14b44 100644 --- a/nova/cells/rpc_driver.py +++ b/nova/cells/rpc_driver.py @@ -121,8 +121,7 @@ class InterCellRPCAPI(object): """ transport_url = next_hop.db_info['transport_url'] if transport_url not in self.transports: - transport = messaging.get_transport(nova.conf.CONF, transport_url, - rpc.TRANSPORT_ALIASES) + transport = messaging.get_transport(nova.conf.CONF, transport_url) self.transports[transport_url] = transport else: transport = self.transports[transport_url] diff --git a/nova/rpc.py b/nova/rpc.py index 54eeb8e8725a..09ff40ca8ced 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -23,7 +23,6 @@ __all__ = [ 'get_client', 'get_server', 'get_notifier', - 'TRANSPORT_ALIASES', ] import functools @@ -57,25 +56,13 @@ ALLOWED_EXMODS = [ ] EXTRA_EXMODS = [] -# NOTE(markmc): The nova.openstack.common.rpc entries are for backwards compat -# with Havana rpc_backend configuration values. The nova.rpc entries are for -# compat with Essex values. -TRANSPORT_ALIASES = { - 'nova.openstack.common.rpc.impl_kombu': 'rabbit', - 'nova.openstack.common.rpc.impl_qpid': 'qpid', - 'nova.openstack.common.rpc.impl_zmq': 'zmq', - 'nova.rpc.impl_kombu': 'rabbit', - 'nova.rpc.impl_qpid': 'qpid', - 'nova.rpc.impl_zmq': 'zmq', -} - def init(conf): global TRANSPORT, NOTIFICATION_TRANSPORT, LEGACY_NOTIFIER, NOTIFIER exmods = get_allowed_exmods() TRANSPORT = create_transport(get_transport_url()) NOTIFICATION_TRANSPORT = messaging.get_notification_transport( - conf, allowed_remote_exmods=exmods, aliases=TRANSPORT_ALIASES) + conf, allowed_remote_exmods=exmods) serializer = RequestContextSerializer(JsonPayloadSerializer()) if conf.notifications.notification_format == 'unversioned': LEGACY_NOTIFIER = messaging.Notifier(NOTIFICATION_TRANSPORT, @@ -182,7 +169,7 @@ class ProfilerRequestContextSerializer(RequestContextSerializer): 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): @@ -232,8 +219,7 @@ def create_transport(url): exmods = get_allowed_exmods() return messaging.get_transport(CONF, url=url, - allowed_remote_exmods=exmods, - aliases=TRANSPORT_ALIASES) + allowed_remote_exmods=exmods) class LegacyValidatingNotifier(object): diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py index ceb46a271551..dc38c6276007 100644 --- a/nova/tests/fixtures.py +++ b/nova/tests/fixtures.py @@ -664,8 +664,7 @@ class RPCFixture(fixtures.Fixture): self._buses[url] = messaging.get_transport( CONF, url=url, - allowed_remote_exmods=exmods, - aliases=rpc.TRANSPORT_ALIASES) + allowed_remote_exmods=exmods) return self._buses[url] def setUp(self): diff --git a/nova/tests/unit/cells/test_cells_rpc_driver.py b/nova/tests/unit/cells/test_cells_rpc_driver.py index e51f68d0b1c0..3b8c253d2eb3 100644 --- a/nova/tests/unit/cells/test_cells_rpc_driver.py +++ b/nova/tests/unit/cells/test_cells_rpc_driver.py @@ -89,8 +89,7 @@ class CellsRPCDriverTestCase(test.NoDBTestCase): # first call to _get_transport creates a oslo.messaging.Transport obj with mock.patch.object(oslo_messaging, 'get_transport') as get_trans: transport = rpcapi._get_transport(next_hop) - get_trans.assert_called_once_with(rpc_driver.CONF, transport_url, - rpc.TRANSPORT_ALIASES) + get_trans.assert_called_once_with(rpc_driver.CONF, transport_url) self.assertIn(transport_url, rpcapi.transports) self.assertEqual(transport, rpcapi.transports[transport_url]) diff --git a/nova/tests/unit/test_rpc.py b/nova/tests/unit/test_rpc.py index 41eff64277d1..051ea8e7913c 100644 --- a/nova/tests/unit/test_rpc.py +++ b/nova/tests/unit/test_rpc.py @@ -179,8 +179,7 @@ class TestRPC(testtools.TestCase): url = rpc.get_transport_url(url_str='bar') self.assertEqual('foo', url) - mock_url.parse.assert_called_once_with(conf, 'bar', - rpc.TRANSPORT_ALIASES) + mock_url.parse.assert_called_once_with(conf, 'bar') @mock.patch.object(messaging, 'TransportURL') def test_get_transport_url_null(self, mock_url): @@ -191,8 +190,7 @@ class TestRPC(testtools.TestCase): url = rpc.get_transport_url() self.assertEqual('foo', url) - mock_url.parse.assert_called_once_with(conf, None, - rpc.TRANSPORT_ALIASES) + mock_url.parse.assert_called_once_with(conf, None) @mock.patch.object(rpc, 'profiler', None) @mock.patch.object(rpc, 'RequestContextSerializer') @@ -314,8 +312,7 @@ class TestRPC(testtools.TestCase): mock_exmods.assert_called_once_with() mock_transport.assert_called_once_with(rpc.CONF, url=mock.sentinel.url, - allowed_remote_exmods=exmods, - aliases=rpc.TRANSPORT_ALIASES) + allowed_remote_exmods=exmods) def _test_init(self, mock_notif, mock_noti_trans, mock_ser, mock_exmods, notif_format, expected_driver_topic_kwargs,