openstack/neutron
Code Issues Proposed changes

[FT] Mock the DB lock methods in `TestOvnNbSync` tests

Browse Source 
The class ``TestOvnNbSync`` tests instantiate the class
``DBInconsistenciesPeriodics`` several times. Sometimes these tests
fail when trying to lock the database twice:

  tcp:127.0.0.1:50378: received request, method="lock", params=["ovn_db_inconsistencies_periodics"], id=3017
  tcp:127.0.0.1:50378: send reply, result={"locked":true}, id=3017
  tcp:127.0.0.1:50378: received request, method="lock", params=["ovn_db_inconsistencies_periodics"], id=3017
  tcp:127.0.0.1:50378: send reply, error={"details":"must issue \"unlock\" before new \"lock\"","error":"syntax error","syntax":"[\"ovn_db_inconsistencies_periodics\"]"}, id=3017

To avoid this issue, the ``set_lock`` method of the IDL is mocked
and the corresponding ``has_lock`` to always return True.

Signed-off-by: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Change-Id: I17a6e509db6c515cfde4fbee7b0ca4955ad43961
This commit is contained in:
Rodolfo Alonso Hernandez
2025-09-03 08:06:14 +00:00
parent 84f606a9bc
commit b211df9101
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovn_db_sync.py
View File

@@ -14,6 +14,7 @@
from collections import defaultdict
from collections import namedtuple
from unittest import mock
import netaddr
from neutron_lib.api.definitions import dns as dns_apidef
@@ -39,7 +40,9 @@ from neutron.common.ovn import utils
from neutron.conf.plugins.ml2.drivers.ovn import ovn_conf as ovn_config
from neutron.plugins.ml2.drivers.ovn.mech_driver.ovsdb.extensions \
import qos as qos_extension
from neutron.plugins.ml2.drivers.ovn.mech_driver.ovsdb import maintenance
from neutron.plugins.ml2.drivers.ovn.mech_driver.ovsdb import ovn_db_sync
from neutron.plugins.ml2.drivers.ovn.mech_driver.ovsdb import ovsdb_monitor
from neutron.services.portforwarding.drivers.ovn.driver import \
OVNPortForwarding as ovn_pf
from neutron.services.revisions import revision_plugin
@@ -57,6 +60,13 @@ class TestOvnNbSync(testlib_api.MySQLTestCaseMixin,
_extension_drivers = ['port_security', 'dns', 'qos', 'revision_plugin']
def setUp(self, *args):
self._mock_has_lock = mock.patch.object(
maintenance.DBInconsistenciesPeriodics, 'has_lock',
mock.PropertyMock(return_value=True))
self.mock_has_lock = self._mock_has_lock.start()
self._mock_set_lock =mock.patch.object(
ovsdb_monitor.BaseOvnIdl, 'set_lock')
self.mock_set_lock = self._mock_set_lock.start()
super().setUp(maintenance_worker=True)
self.assertEqual(mysql_dialect.name, self.db.engine.dialect.name)
ovn_config.cfg.CONF.set_override('dns_domain', 'ovn.test')