openstack
/
neutron
Code Issues Proposed changes

Pecan: add missing body to delete notify payload 

The legacy API controller included the original object in the delete
notification body payload. This adjusts pecan to do the same.

Closes-Bug: #1714386
Change-Id: I5b2f87e7b1eccceedb821506bb2de43b764fde8d
changes/32/499432/3
Kevin Benton 2017-08-30 20:14:57 -07:00 committed by garyk
parent 090a6af0ec
commit 1d3c404d73
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/pecan_wsgi/hooks/notifier.py
View File

@ -100,5 +100,6 @@ class NotifierHook(hooks.PecanHook):
if action == 'delete':
resource_id = state.request.context.get('resource_id')
result = {resource_name + '_id': resource_id}
result[resource_name + '_id'] = resource_id
self._notifier.info(neutron_context, notifier_method, result)

9
neutron/tests/functional/pecan_wsgi/test_hooks.py
View File

@ -316,13 +316,16 @@ class TestMetricsNotifierHook(test_functional.PecanFunctionalTest):
self.mock_notifier.mock_calls)
self.mock_notifier.reset_mock()
before_payload = {'network_id': network_id}
after_payload = before_payload.copy()
after_payload['network'] = directory.get_plugin().get_network(
context.get_admin_context(), network_id)
response = self.app.delete(
'/v2.0/networks/%s.json' % network_id, headers=req_headers)
self.assertEqual(204, response.status_int)
payload = {'network_id': network_id}
self.assertEqual(
[mock.call(mock.ANY, 'network.delete.start', payload),
mock.call(mock.ANY, 'network.delete.end', payload)],
[mock.call(mock.ANY, 'network.delete.start', before_payload),
mock.call(mock.ANY, 'network.delete.end', after_payload)],
self.mock_notifier.mock_calls)
def test_bulk_create_triggers_notification(self):