openstack/nova
Code Issues Proposed changes

Replace topic with topics for messaging.Notifier

Browse Source 
According the repeated warning during py34 test runs 'topic' has been
deprecated in favor of 'topics' for oslo.messaging Notifiers. This
updates the Nova usage in order to not get yelled at.

Depends-On: Iedd1f5264e87e506bd3a1c09614aa1dc891dc685
Change-Id: Id028e6a406fa871e6561f36f95ed748afc320a20
This commit is contained in:
Andrew Laski 2016-03-21 10:35:29 -04:00
parent 053c196008
commit a726162e1e
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/rpc.py
View File

@ -84,14 +84,14 @@ def init(conf):
serializer=serializer)
NOTIFIER = messaging.Notifier(NOTIFICATION_TRANSPORT,
serializer=serializer,
topic='versioned_notifications')
topics=['versioned_notifications'])
else:
LEGACY_NOTIFIER = messaging.Notifier(NOTIFICATION_TRANSPORT,
serializer=serializer,
driver='noop')
NOTIFIER = messaging.Notifier(NOTIFICATION_TRANSPORT,
serializer=serializer,
topic='versioned_notifications')
topics=['versioned_notifications'])
def cleanup():

4
nova/tests/unit/test_notifier.py
View File

@ -37,11 +37,11 @@ class TestNotifier(test.NoDBTestCase):
'both': [
mock.call(mock.ANY, serializer=mock.ANY),
mock.call(mock.ANY, serializer=mock.ANY,
topic='versioned_notifications')],
topics=['versioned_notifications'])],
'versioned': [
mock.call(mock.ANY, serializer=mock.ANY, driver='noop'),
mock.call(mock.ANY, serializer=mock.ANY,
topic='versioned_notifications')]}
topics=['versioned_notifications'])]}
for config in cases:
mock_notifier.reset_mock()

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

@ -69,7 +69,7 @@ class TestRPC(testtools.TestCase):
@mock.patch.object(messaging, 'Notifier')
def test_init_both(self, mock_notif, mock_noti_trans, mock_trans,
mock_ser, mock_exmods):
expected = [{}, {'topic': 'versioned_notifications'}]
expected = [{}, {'topics': ['versioned_notifications']}]
self._test_init(mock_notif, mock_noti_trans, mock_trans, mock_ser,
mock_exmods, 'both', expected)
@ -80,7 +80,8 @@ class TestRPC(testtools.TestCase):
@mock.patch.object(messaging, 'Notifier')
def test_init_versioned(self, mock_notif, mock_noti_trans, mock_trans,
mock_ser, mock_exmods):
expected = [{'driver': 'noop'}, {'topic': 'versioned_notifications'}]
expected = [{'driver': 'noop'},
{'topics': ['versioned_notifications']}]
self._test_init(mock_notif, mock_noti_trans, mock_trans, mock_ser,
mock_exmods, 'versioned', expected)