openstack/neutron
Code Issues Proposed changes

Merge "[OVN] Remove the check of presence of "Chassis_Private""

Browse Source
This commit is contained in:
Zuul
2025-08-06 09:06:22 +00:00
committed by Gerrit Code Review
parent 821cc5e51c 227da23f7a
commit 224cb635d1
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py
View File

@@ -1603,14 +1603,11 @@ def delete_agent(self, context, id, _driver=None):
chassis_name = agent['configurations']['chassis_name']
_driver.sb_ovn.chassis_del(chassis_name, if_exists=True).execute(
check_error=True)
if _driver.sb_ovn.is_table_present('Chassis_Private'):
# TODO(ralonsoh): implement the corresponding chassis_private
# commands in ovsdbapp.
try:
_driver.sb_ovn.db_destroy('Chassis_Private', chassis_name).execute(
check_error=True)
except idlutils.RowNotFound:
pass
try:
_driver.sb_ovn.db_destroy('Chassis_Private', chassis_name).execute(
check_error=True)
except idlutils.RowNotFound:
pass
# Send a specific event that all API workers can get to delete the agent
# from their caches. Ideally we could send a single transaction that both
# created and deleted the key, but alas python-ovs is too "smart"

9
neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py
View File

@@ -1403,11 +1403,10 @@ class TestAgentApi(base.TestOVNFunctionalBase):
def _check_chassis_registers(self, present=True):
chassis = self.sb_api.lookup('Chassis', self.chassis, default=None)
chassis_name = chassis.name if chassis else None
if self.sb_api.is_table_present('Chassis_Private'):
ch_private = self.sb_api.lookup(
'Chassis_Private', self.chassis, default=None)
ch_private_name = ch_private.name if ch_private else None
self.assertEqual(chassis_name, ch_private_name)
ch_private = self.sb_api.lookup(
'Chassis_Private', self.chassis, default=None)
ch_private_name = ch_private.name if ch_private else None
self.assertEqual(chassis_name, ch_private_name)
if present:
self.assertEqual(self.chassis, chassis_name)
else: