diff --git a/neutron/api/v2/base.py b/neutron/api/v2/base.py index 73593072b56..a86ed042537 100644 --- a/neutron/api/v2/base.py +++ b/neutron/api/v2/base.py @@ -550,10 +550,12 @@ class Controller(object): # usage trackers as dirty resource_registry.set_resources_dirty(request.context) notifier_method = self._resource + '.delete.end' + result = {self._resource: self._view(request.context, obj)} + notifier_payload = {self._resource + '_id': id} + notifier_payload.update(result) self._notifier.info(request.context, notifier_method, - {self._resource + '_id': id}) - result = {self._resource: self._view(request.context, obj)} + notifier_payload) registry.notify(self._resource, events.BEFORE_RESPONSE, self, context=request.context, data=result, method_name=notifier_method, action=action, diff --git a/neutron/tests/unit/api/v2/test_base.py b/neutron/tests/unit/api/v2/test_base.py index 7ac7c79ad64..8f54c4da825 100644 --- a/neutron/tests/unit/api/v2/test_base.py +++ b/neutron/tests/unit/api/v2/test_base.py @@ -1329,6 +1329,11 @@ class NotificationTest(APIv2TestBase): for msg, event in zip(fake_notifier.NOTIFICATIONS, expected_events): self.assertEqual('INFO', msg['priority']) self.assertEqual(event, msg['event_type']) + if opname == 'delete' and event == 'network.delete.end': + self.assertIn('payload', msg) + resource = msg['payload'] + self.assertIn('network_id', resource) + self.assertIn('network', resource) self.assertEqual(expected_code, res.status_int)