Merge "Revert "[OVN] Set NB/SB "connection" inactivity probe"" into stable/yoga

Author: Zuul

neutron/common/ovn/utils.py

@@ -14,7 +14,6 @@
 import copy
 import inspect
 import os
-import re
 
 import netaddr
 from neutron_lib.api.definitions import external_net
@@ -686,23 +685,3 @@ def is_port_external(port):
 
     return (vnic_type in constants.EXTERNAL_PORT_TYPES and
             constants.PORT_CAP_SWITCHDEV not in capabilities)
-
-
-def connection_config_to_target_string(connection_config):
-    """Converts the Neutron NB/SB connection parameter to the OVN target string
-
-    :param connection_config: Neutron OVN config parameter for the OVN NB or SB
-                              database. See "ovn_sb_connection" or
-                              "ovn_nb_connection" params.
-    :returns: (String) OVN NB/SB ``connection.target`` column value.
-    """
-    regex = re.compile(r'^(?P<proto>\w+)\:((?P<ip>.+)\:(?P<port>\d+)|'
-                       r'(?P<file>[\w\/\.]+))')
-    m = regex.match(connection_config)
-    if m:
-        _dict = m.groupdict()
-        if _dict['ip'] and _dict['port']:
-            return ('p' + _dict['proto'] + ':' + _dict['port'] + ':' +
-                    _dict['ip'])
-        elif _dict['file']:
-            return 'p' + _dict['proto'] + ':' + _dict['file']

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

@@ -39,7 +39,6 @@
 from oslo_db import exception as os_db_exc
 from oslo_log import log
 from oslo_utils import timeutils
-from ovsdbapp.backend.ovs_idl import idlutils
 
 from neutron._i18n import _
 from neutron.common.ovn import acl as ovn_acl
@@ -280,7 +279,6 @@ def pre_fork_initialize(self, resource, event, trigger, payload=None):
         atexit.register(self._clean_hash_ring)
         signal.signal(signal.SIGTERM, self._clean_hash_ring)
         self._create_neutron_pg_drop()
-        self._set_inactivity_probe()
 
     def _create_neutron_pg_drop(self):
         """Create neutron_pg_drop Port Group.
@@ -322,28 +320,6 @@ def _create_neutron_pg_drop(self):
                 LOG.info("Porg Group %(pg)s was created by another server",
                          {'pg': ovn_const.OVN_DROP_PORT_GROUP_NAME})
 
-    def _set_inactivity_probe(self):
-        """Set 'connection.inactivity_probe' in NB and SB databases"""
-        inactivity_probe = ovn_conf.get_ovn_ovsdb_probe_interval()
-        dbs = [(ovn_conf.get_ovn_nb_connection(), self.nb_schema_helper,
-                impl_idl_ovn.OvsdbNbOvnIdl),
-               (ovn_conf.get_ovn_sb_connection(), self.sb_schema_helper,
-                impl_idl_ovn.OvsdbSbOvnIdl)]
-        for connection, schema, klass in dbs:
-            target = ovn_utils.connection_config_to_target_string(connection)
-            if not target:
-                continue
-
-            idl = ovsdb_monitor.BaseOvnIdl.from_server(connection, schema)
-            with ovsdb_monitor.short_living_ovsdb_api(klass, idl) as idl_api:
-                conn = idlutils.row_by_value(idl_api, 'Connection', 'target',
-                                             target, None)
-                if conn:
-                    idl_api.db_set(
-                        'Connection', target,
-                        ('inactivity_probe', int(inactivity_probe))).execute(
-                        check_error=True)
-
     @staticmethod
     def should_post_fork_initialize(worker_class):
         return worker_class in (neutron.wsgi.WorkerService,

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

@@ -815,7 +815,6 @@ def from_server(cls, connection_string, helper, driver):
         helper.register_table('Encap')
         helper.register_table('Port_Binding')
         helper.register_table('Datapath_Binding')
-        helper.register_table('Connection')
         helper.register_columns('SB_Global', ['external_ids'])
         try:
             return cls(driver, connection_string, helper, leader_only=False)

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

@@ -29,7 +29,6 @@
 from ovsdbapp.backend.ovs_idl import event
 from ovsdbapp.tests.functional import base as ovs_base
 
-from neutron.agent.linux import utils as linux_utils
 from neutron.common.ovn import constants as ovn_const
 from neutron.common.ovn import utils
 from neutron.common import utils as n_utils
@@ -1220,56 +1219,3 @@ def test_agent_delete(self):
         self.plugin.delete_agent(self.context, metadata_id)
         self.assertRaises(agent_exc.AgentNotFound, self.plugin.get_agent,
                           self.context, metadata_id)
-
-
-class ConnectionInactivityProbeSetEvent(event.WaitEvent):
-    """Wait for a Connection (NB/SB) to have the inactivity probe set"""
-
-    ONETIME = False
-
-    def __init__(self, target, inactivity_probe):
-        table = 'Connection'
-        events = (self.ROW_UPDATE,)
-        super().__init__(events, table, None)
-        self.event_name = "ConnectionEvent"
-        self.target = target
-        self.inactivity_probe = inactivity_probe
-
-    def match_fn(self, event, row, old):
-        return row.target in self.target
-
-    def run(self, event, row, old):
-        if (row.inactivity_probe and
-                row.inactivity_probe[0] == self.inactivity_probe):
-            self.event.set()
-
-
-class TestSetInactivityProbe(base.TestOVNFunctionalBase):
-
-    def setUp(self):
-        super().setUp()
-        self.dbs = [(ovn_conf.get_ovn_nb_connection(), 'ptcp:1000:1.2.3.4'),
-                    (ovn_conf.get_ovn_sb_connection(), 'ptcp:1001:1.2.3.4')]
-        linux_utils.execute(
-            ['ovn-nbctl', '--db=%s' % self.dbs[0][0],
-             'set-connection', self.dbs[0][1]], run_as_root=True,
-            privsep_exec=True)
-        linux_utils.execute(
-            ['ovn-sbctl', '--db=%s' % self.dbs[1][0],
-             'set-connection', self.dbs[1][1]], run_as_root=True,
-            privsep_exec=True)
-
-    def test_1(self):
-        mock.patch.object(ovn_conf, 'get_ovn_ovsdb_probe_interval',
-                          return_value='2500').start()
-        nb_connection = ConnectionInactivityProbeSetEvent(self.dbs[0][1], 2500)
-        sb_connection = ConnectionInactivityProbeSetEvent(self.dbs[1][1], 2500)
-        self.nb_api.idl.notify_handler.watch_event(nb_connection)
-        self.sb_api.idl.notify_handler.watch_event(sb_connection)
-        with mock.patch.object(utils, 'connection_config_to_target_string') \
-                as mock_target:
-            mock_target.side_effect = [self.dbs[0][1], self.dbs[1][1]]
-            self.mech_driver._set_inactivity_probe()
-
-        self.assertTrue(nb_connection.wait())
-        self.assertTrue(sb_connection.wait())

neutron/tests/unit/common/ovn/test_utils.py

@@ -373,22 +373,6 @@ def test_get_lsp_dhcp_opts(self):
         self.assertEqual(expected_options, options)
 
 
-class TestConnectionConfigToTargetString(base.BaseTestCase):
-
-    def test_strings(self):
-        config_target = (
-            ('ssl:1.2.3.4:5678', 'pssl:5678:1.2.3.4'),
-            ('tcp:1.2.3.4:5678', 'ptcp:5678:1.2.3.4'),
-            ('ssl:[::1]:5678', 'pssl:5678:[::1]'),
-            ('tcp:[::1]:5678', 'ptcp:5678:[::1]'),
-            ('unix:/var/run/ovs/db.sock', 'punix:/var/run/ovs/db.sock'),
-            ('wrong_value', None))
-
-        for config, target in config_target:
-            output = utils.connection_config_to_target_string(config)
-            self.assertEqual(target, output)
-
-
 class TestGetDhcpDnsServers(base.BaseTestCase):
 
     def test_ipv4(self):