openstack/nova
Code Issues Proposed changes

Merge "Remove old oslo.messaging transport aliases"

Browse Source
This commit is contained in:
Jenkins
2017-03-17 16:12:52 +00:00
committed by Gerrit Code Review
parent 6d9e77bd9f 05c50f2479
commit a3b987f90c
5 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/cells/rpc_driver.py
View File

@@ -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]

20
nova/rpc.py
View File

@@ -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):

3
nova/tests/fixtures.py
View File

@@ -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):

3
nova/tests/unit/cells/test_cells_rpc_driver.py
View File

@@ -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])

9
nova/tests/unit/test_rpc.py
View File

@@ -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,