From b7ff572f24e9c62aed6f5a9081247fb1cb83a67f Mon Sep 17 00:00:00 2001 From: Boden R Date: Fri, 24 Aug 2018 12:06:17 -0600 Subject: [PATCH] use payloads for PORT BEFORE_DELETE callbacks This patch switches BEFORE_DELETE callback events for PORT resources over to the payload style args use a DBEventPayload object in prep for the depends on patch. Change-Id: I8b4b0387f6934c3f1001d3aada5c47a784d3706a Depends-On: https://review.openstack.org/#/c/595883/ --- neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py b/neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py index c53025cd1..e2f7ea320 100644 --- a/neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py +++ b/neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py @@ -1034,10 +1034,9 @@ class LoadBalancerPluginDbv2(base_db.CommonDbMixin, for rule_db in rule_dbs] -def _prevent_lbaasv2_port_delete_callback(resource, event, trigger, **kwargs): - context = kwargs['context'] - port_id = kwargs['port_id'] - port_check = kwargs['port_check'] +def _prevent_lbaasv2_port_delete_callback(resource, event, + trigger, payload=None): lbaasv2plugin = directory.get_plugin(pg_const.LOADBALANCERV2) - if lbaasv2plugin and port_check: - lbaasv2plugin.db.prevent_lbaasv2_port_deletion(context, port_id) + if lbaasv2plugin and payload.metadata['port_check']: + lbaasv2plugin.db.prevent_lbaasv2_port_deletion( + payload.context, payload.resource_id)