From 9758e72fcf17ee6d5e2cccba89b71bed00e21433 Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Fri, 23 Apr 2021 17:32:07 +0100 Subject: [PATCH] [OVN] MetadataProxyHandler to conditionally monitor both Chassis's tables If both Chassis and Chassis_Private tables are passed to the MetadataProxyHandler class we should conditionally monitor both of them. Change-Id: Iffd1deb977e92b9a600ab2603408ddf2eb387e18 Co-Authored-By: Terry Wilson Closes-Bug: #1925836 Signed-off-by: Lucas Alvares Gomes (cherry picked from commit ce2c0010b93680bdcb6619940a84f8602769b837) --- neutron/agent/ovn/metadata/ovsdb.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neutron/agent/ovn/metadata/ovsdb.py b/neutron/agent/ovn/metadata/ovsdb.py index f239c172373..661e2525bbf 100644 --- a/neutron/agent/ovn/metadata/ovsdb.py +++ b/neutron/agent/ovn/metadata/ovsdb.py @@ -39,9 +39,9 @@ class MetadataAgentOvnSbIdl(ovsdb_monitor.OvnIdl): super(MetadataAgentOvnSbIdl, self).__init__( None, connection_string, helper) if chassis: - table = ('Chassis_Private' if 'Chassis_Private' in tables - else 'Chassis') - self.tables[table].condition = [['name', '==', chassis]] + for table in set(tables).intersection({'Chassis', + 'Chassis_Private'}): + self.tables[table].condition = [['name', '==', chassis]] if events: self.notify_handler.watch_events(events)