openstack/neutron
Code Issues Proposed changes

Merge "use payloads for SUBNET BEFORE_DELETE events"

Browse Source
This commit is contained in:
Zuul 2018-10-24 10:16:14 +00:00 committed by Gerrit Code Review
commit 83dffac498
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/db/db_base_plugin_v2.py
View File

@ -79,9 +79,9 @@ AUTO_DELETE_PORT_OWNERS = [constants.DEVICE_OWNER_DHCP]
def _check_subnet_not_used(context, subnet_id): def _check_subnet_not_used(context, subnet_id):
try: try:
kwargs = {'context': context, 'subnet_id': subnet_id} registry.publish(
registry.notify( resources.SUBNET, events.BEFORE_DELETE, None,
resources.SUBNET, events.BEFORE_DELETE, None, **kwargs) payload=events.DBEventPayload(context, resource_id=subnet_id))
except exceptions.CallbackFailure as e: except exceptions.CallbackFailure as e:
raise exc.SubnetInUse(subnet_id=subnet_id, reason=e) raise exc.SubnetInUse(subnet_id=subnet_id, reason=e)

4
neutron/tests/unit/db/test_db_base_plugin_v2.py
View File

@ -5499,13 +5499,13 @@ class TestSubnetsV2(NeutronDbPluginV2TestCase):
def test_delete_subnet_with_callback(self): def test_delete_subnet_with_callback(self):
with self.subnet() as subnet,\ with self.subnet() as subnet,\
mock.patch.object(registry, 'notify') as notify: mock.patch.object(registry, 'publish') as publish:
errors = [ errors = [
exceptions.NotificationError( exceptions.NotificationError(
'fake_id', lib_exc.NeutronException()), 'fake_id', lib_exc.NeutronException()),
] ]
notify.side_effect = [ publish.side_effect = [
exceptions.CallbackFailure(errors=errors), None exceptions.CallbackFailure(errors=errors), None
] ]