openstack/neutron
Code Issues Proposed changes

Fix ovn_db_sync for user defined flavor routers

Browse Source 
When ovn_db_sync is executed in repair mode after a Neutron server
restart, it erronously adds user defined flavor routers to the OVN NBDB.
Those routers are not managed by OVN. Hereby the issue if fixed.

Change-Id: Iacd78020ee41399c3a8ce6cfdf9e37c4f865c90e
Closes-Bug: #2110060
This commit is contained in:
Miguel Lavalle
2025-05-14 19:13:42 -05:00
parent 1bc4b526e9
commit a37c2d2a1e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_db_sync.py
View File

@@ -564,6 +564,8 @@ class OvnNbSynchronizer(OvnDbSynchronizer):
db_extends = {} db_extends = {}
db_router_ports = {} db_router_ports = {}
for router in self.l3_plugin.get_routers(ctx): for router in self.l3_plugin.get_routers(ctx):
if not utils.is_ovn_provider_router(router):
continue
db_routers[router['id']] = router db_routers[router['id']] = router
db_extends[router['id']] = {} db_extends[router['id']] = {}
db_extends[router['id']]['routes'] = [] db_extends[router['id']]['routes'] = []

4
neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovn_db_sync.py
View File

@@ -263,7 +263,9 @@ class TestOvnNbSyncML2(test_mech_driver.OVNMechanismDriverTestCase):
'external_fixed_ips': [ 'external_fixed_ips': [
{'subnet_id': 'ext-subnet', {'subnet_id': 'ext-subnet',
'ip_address': '100.0.0.2'}]}}, 'ip_address': '100.0.0.2'}]}},
{'id': 'r4', 'routes': []}] {'id': 'r4', 'routes': []},
{'id': 'r5', 'routes': [],
'flavor_id': 'user-defined'}]
self.get_sync_router_ports = [ self.get_sync_router_ports = [
{'fixed_ips': [{'subnet_id': 'subnet1', {'fixed_ips': [{'subnet_id': 'subnet1',