From b23243f065cb6680e581cb844340337ef59b9d03 Mon Sep 17 00:00:00 2001
From: Eduardo Olivares <eolivare@redhat.com>
Date: Mon, 22 Mar 2021 11:57:21 +0100
Subject: [PATCH] Fix ovn_dbs_vip_bindings for old OSP releases

OVN master DB socket behaves different in different OSP releases:
- in OSP13, the sockets are centrallized and can only be seen in the
  controller node where the OVN master DB runs
- in later releases, the sockets are distributed and can be found in any
  controller node

Change-Id: I0541ae80ffbe537457379b170ffa95b9baa4a785
---
 tobiko/openstack/tests/_neutron.py     | 38 +++++++++++++++-----------
 tobiko/openstack/topology/__init__.py  |  1 +
 tobiko/openstack/topology/_topology.py |  9 ++++--
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/tobiko/openstack/tests/_neutron.py b/tobiko/openstack/tests/_neutron.py
index 2264ac293..92b1d88fb 100644
--- a/tobiko/openstack/tests/_neutron.py
+++ b/tobiko/openstack/tests/_neutron.py
@@ -15,13 +15,6 @@ from tobiko.tripleo import pacemaker
 LOG = log.getLogger(__name__)
 
 
-def get_osp_version():
-    try:
-        return topology.get_openstack_version()
-    except Exception:
-        return None
-
-
 def is_ovn_configured():
     return containers.ovn_used_on_overcloud()
 
@@ -57,13 +50,8 @@ def test_neutron_agents_are_alive(timeout=300., interval=5.):
             LOG.debug(f"Waiting for neutron service... ({ex})")
             continue  # Let retry
 
-        rhosp_version = get_osp_version()
-        rhosp_major_release = (int(rhosp_version.split('.')[0])
-                               if rhosp_version
-                               else None)
-
-        if (rhosp_major_release and rhosp_major_release <= 13 and
-                is_ovn_configured()):
+        if (topology.verify_osp_version('14.0', lower=True)
+                and is_ovn_configured()):
             LOG.debug("Neutron list agents should return an empty list with"
                       "OVN and RHOSP releases 13 or earlier")
             test_case.assertEqual([], agents)
@@ -195,10 +183,16 @@ def ovn_dbs_vip_bindings(test_case):
                                'configuration file')
         ovn_conn[db]['port'] = ovn_conn_str[db].split(':')[-1]
 
+    # ovn db sockets might be centrillized or distributed
+    # that depends on the openstack version under test
+    ovn_db_sockets_centrallized = topology.verify_osp_version(
+        '14.0', lower=True)
+
     # command to obtain sockets listening on OVN SB and DB DBs
     get_ovn_db_sockets_listening_cmd = \
         "ss -p state listening 'sport = {srcport} and src {srcip}'"
 
+    num_db_sockets = 0
     for controller in controllers:
         for db in ('nb', 'sb'):
             ovn_db_sockets_listening = sh.execute(
@@ -207,8 +201,20 @@ def ovn_dbs_vip_bindings(test_case):
                     srcip=ovn_conn[db]['ip']),
                 ssh_client=controller.ssh_client,
                 sudo=True).stdout.splitlines()
-            test_case.assertEqual(2, len(ovn_db_sockets_listening))
-            test_case.assertIn('ovsdb-server', ovn_db_sockets_listening[1])
+            if ovn_db_sockets_centrallized:
+                if 2 == len(ovn_db_sockets_listening):
+                    num_db_sockets += 1
+                    test_case.assertIn('ovsdb-server',
+                                       ovn_db_sockets_listening[1])
+            else:
+                num_db_sockets += 1
+                test_case.assertEqual(2, len(ovn_db_sockets_listening))
+                test_case.assertIn('ovsdb-server', ovn_db_sockets_listening[1])
+
+    if ovn_db_sockets_centrallized:
+        test_case.assertEqual(2, num_db_sockets)
+    else:
+        test_case.assertEqual(2 * len(controllers), num_db_sockets)
 
 
 def test_ovn_dbs_validations():
diff --git a/tobiko/openstack/topology/__init__.py b/tobiko/openstack/topology/__init__.py
index fbe8e8089..f59264167 100644
--- a/tobiko/openstack/topology/__init__.py
+++ b/tobiko/openstack/topology/__init__.py
@@ -39,3 +39,4 @@ OpenStackTopology = _topology.OpenStackTopology
 OpenStackTopologyNode = _topology.OpenStackTopologyNode
 set_default_openstack_topology_class = (
     _topology.set_default_openstack_topology_class)
+verify_osp_version = _topology.verify_osp_version
diff --git a/tobiko/openstack/topology/_topology.py b/tobiko/openstack/topology/_topology.py
index b5b537c75..7ceb1800b 100644
--- a/tobiko/openstack/topology/_topology.py
+++ b/tobiko/openstack/topology/_topology.py
@@ -568,11 +568,14 @@ def _is_version_matched(current, required, higher=False, lower=False):
 
 
 def verify_osp_version(version, higher=False, lower=False):
-    current_version = get_openstack_version()
-    correct_version = True
+    try:
+        current_version = get_openstack_version()
+    except Exception:
+        current_version = None
     if not current_version:
-        correct_version = False
+        return False
     else:
+        correct_version = True
         os_version = current_version.split('.')
         required_version = version.split('.')
         for version_type in range(len(required_version)):