Merge "Pecan: add missing body to delete notify payload"
This commit is contained in:
commit
8982a07437
@ -100,5 +100,6 @@ class NotifierHook(hooks.PecanHook):
|
|||||||
|
|
||||||
if action == 'delete':
|
if action == 'delete':
|
||||||
resource_id = state.request.context.get('resource_id')
|
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)
|
self._notifier.info(neutron_context, notifier_method, result)
|
||||||
|
@ -316,13 +316,16 @@ class TestMetricsNotifierHook(test_functional.PecanFunctionalTest):
|
|||||||
self.mock_notifier.mock_calls)
|
self.mock_notifier.mock_calls)
|
||||||
self.mock_notifier.reset_mock()
|
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(
|
response = self.app.delete(
|
||||||
'/v2.0/networks/%s.json' % network_id, headers=req_headers)
|
'/v2.0/networks/%s.json' % network_id, headers=req_headers)
|
||||||
self.assertEqual(204, response.status_int)
|
self.assertEqual(204, response.status_int)
|
||||||
payload = {'network_id': network_id}
|
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
[mock.call(mock.ANY, 'network.delete.start', payload),
|
[mock.call(mock.ANY, 'network.delete.start', before_payload),
|
||||||
mock.call(mock.ANY, 'network.delete.end', payload)],
|
mock.call(mock.ANY, 'network.delete.end', after_payload)],
|
||||||
self.mock_notifier.mock_calls)
|
self.mock_notifier.mock_calls)
|
||||||
|
|
||||||
def test_bulk_create_triggers_notification(self):
|
def test_bulk_create_triggers_notification(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user