From db4753b6efa12f6aa86219de90855835b683daa5 Mon Sep 17 00:00:00 2001
From: Nurmatov Mamatisa <nurmatov.mamatisa@huawei.com>
Date: Fri, 20 Aug 2021 17:42:20 +0300
Subject: [PATCH] use payload for OVSDB_RESOURCE

This patch switches over to callback payloads for
OVSDB_RESOURCE AFTER_READ event

Change-Id: Ia7a96ff270c9defa782f02df8a58bd87c1853b52
---
 .../drivers/openvswitch/agent/ovs_neutron_agent.py    | 11 ++++++-----
 .../trunk/drivers/openvswitch/agent/ovsdb_handler.py  |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
index c4fa37100c7..87859ae23b9 100644
--- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
@@ -2460,11 +2460,12 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
                                           failed_devices,
                                           failed_ancillary_devices,
                                           updated_ports_copy))
-            registry.notify(
-                constants.OVSDB_RESOURCE,
-                callback_events.AFTER_READ,
-                self,
-                ovsdb_events=events)
+            registry.publish(constants.OVSDB_RESOURCE,
+                             callback_events.AFTER_READ,
+                             self,
+                             payload=callback_events.EventPayload(
+                                 context=None,
+                                 states=(events,)))
 
         return (port_info, ancillary_port_info, consecutive_resyncs,
                 ports_not_ready_yet)
diff --git a/neutron/services/trunk/drivers/openvswitch/agent/ovsdb_handler.py b/neutron/services/trunk/drivers/openvswitch/agent/ovsdb_handler.py
index 119cca622ad..43f1e83aae9 100644
--- a/neutron/services/trunk/drivers/openvswitch/agent/ovsdb_handler.py
+++ b/neutron/services/trunk/drivers/openvswitch/agent/ovsdb_handler.py
@@ -131,8 +131,9 @@ class OVSDBHandler(object):
 
     @registry.receives(ovs_agent_constants.OVSDB_RESOURCE, [events.AFTER_READ])
     def process_trunk_port_events(
-            self, resource, event, trigger, ovsdb_events):
+            self, resource, event, trigger, payload):
         """Process added and removed port events coming from OVSDB monitor."""
+        ovsdb_events = payload.latest_state
         for port_event in ovsdb_events['added']:
             port_name = port_event['name']
             if is_trunk_bridge(port_name):