From ed02836a9a0379922b4118ec7071768ee288a067 Mon Sep 17 00:00:00 2001
From: Maor Blaustein <blue@redhat.com>
Date: Wed, 13 Mar 2024 18:49:45 +0200
Subject: [PATCH] Remove any tripleo/director related code in plugin

We decided only to support devstack/podified NextGen jobs
since tripleo code is deprecated and won't be used in upstream.

If for any reason such code will be needed, stable code exists,
can be migrated and adjusted in the future.

Depends-On: https://review.opendev.org/c/x/whitebox-neutron-tempest-plugin/+/912899

Change-Id: I551bfa02c3900ec0e26004038aef3765e21bf817
---
 .../tests/scenario/base.py                        | 15 ---------------
 .../tests/scenario/test_multicast.py              |  7 ++-----
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/whitebox_neutron_tempest_plugin/tests/scenario/base.py b/whitebox_neutron_tempest_plugin/tests/scenario/base.py
index cd9dc9b..1a178d8 100644
--- a/whitebox_neutron_tempest_plugin/tests/scenario/base.py
+++ b/whitebox_neutron_tempest_plugin/tests/scenario/base.py
@@ -140,8 +140,6 @@ class BaseTempestWhiteboxTestCase(base.BaseTempestTestCase):
                     node['is_compute'] = is_compute
                 return
 
-        if WB_CONF.openstack_type == 'tripleo':
-            host = hostname + ".ctlplane"
         node = {'name': hostname,
                 'client': cls.get_node_client(host),
                 'is_networker': is_networker,
@@ -471,19 +469,6 @@ class BaseTempestTestCaseOvn(BaseTempestWhiteboxTestCase):
 
     @classmethod
     def _get_ovn_dbs(cls):
-        ssl_params = ''
-        if WB_CONF.openstack_type == 'tripleo':
-            cmd = ("sudo ovs-vsctl get open . external_ids:ovn-remote | "
-                   "sed -e 's/\"//g'")
-            sbdb = cls.run_on_master_controller(cmd)
-            if 'ssl' in sbdb:
-                ssl_params = '-p {} -c {} -C {} '.format(
-                    WB_CONF.pki_private_key,
-                    WB_CONF.pki_certificate,
-                    WB_CONF.pki_ca_cert)
-            nbdb = sbdb.replace('6642', '6641')
-            cmd = 'ovn-{}ctl --db={} %s' % (ssl_params)
-            cmd = 'sudo %s exec ovn_controller %s' % (cls.container_app, cmd)
         if WB_CONF.openstack_type == 'devstack':
             sbdb = "unix:/usr/local/var/run/ovn/ovnsb_db.sock"
             nbdb = sbdb.replace('sb', 'nb')
diff --git a/whitebox_neutron_tempest_plugin/tests/scenario/test_multicast.py b/whitebox_neutron_tempest_plugin/tests/scenario/test_multicast.py
index 7512b68..a7d41fa 100644
--- a/whitebox_neutron_tempest_plugin/tests/scenario/test_multicast.py
+++ b/whitebox_neutron_tempest_plugin/tests/scenario/test_multicast.py
@@ -797,13 +797,10 @@ class MulticastTestIPv4OvnBase(MulticastTestIPv4, base.BaseTempestTestCaseOvn):
             " options:mcast_relay=" + state)
 
     def restart_ovn_controller_on_compute_nodes(self):
+        prefix = 'edpm_' if WB_CONF.openstack_type == 'podified' else ''
+        cmd = "sudo systemctl restart {}ovn-controller.service".format(prefix)
         for node in self.nodes:
             if node['is_compute'] is True and node['is_controller'] is False:
-                service_prefix = (
-                    "tripleo_" if WB_CONF.openstack_type == "tripleo"
-                    else "")
-                cmd = ("sudo systemctl restart {}"
-                       "ovn-controller.service".format(service_prefix))
                 node['client'].exec_command(cmd)
         time.sleep(10)