Merge pull request #234 from stackhpc/upstream/2025.1-2025-10-13

Synchronise 2025.1 with upstream

Author: priteau

neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py

@@ -693,8 +693,10 @@ def __init__(self, driver):
         self.event_name = 'HAChassisGroupRouterEvent'
 
     def match_fn(self, event, row, old):
-        if (ovn_const.OVN_ROUTER_ID_EXT_ID_KEY in row.external_ids or
-                hasattr(old, 'ha_chassis')):
+        if ovn_const.OVN_ROUTER_ID_EXT_ID_KEY not in row.external_ids:
+            # This is not a router "HA_Chassis_Group".
+            return False
+        if hasattr(old, 'ha_chassis'):
             # "HA_Chassis_Group" has been assigned to a router or there are
             # changes in the "ha_chassis" list.
             return True