x/whitebox-neutron-tempest-plugin
Code Issues Proposed changes

Remove any tripleo/director related code in plugin

Browse Source 
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
This commit is contained in:
Maor Blaustein 2024-03-13 18:49:45 +02:00
parent e33d47c604
commit ed02836a9a
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
whitebox_neutron_tempest_plugin/tests/scenario/base.py
View File

@ -140,8 +140,6 @@ class BaseTempestWhiteboxTestCase(base.BaseTempestTestCase):
node['is_compute'] = is_compute node['is_compute'] = is_compute
return return
if WB_CONF.openstack_type == 'tripleo':
host = hostname + ".ctlplane"
node = {'name': hostname, node = {'name': hostname,
'client': cls.get_node_client(host), 'client': cls.get_node_client(host),
'is_networker': is_networker, 'is_networker': is_networker,
@ -471,19 +469,6 @@ class BaseTempestTestCaseOvn(BaseTempestWhiteboxTestCase):
@classmethod @classmethod
def _get_ovn_dbs(cls): 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': if WB_CONF.openstack_type == 'devstack':
sbdb = "unix:/usr/local/var/run/ovn/ovnsb_db.sock" sbdb = "unix:/usr/local/var/run/ovn/ovnsb_db.sock"
nbdb = sbdb.replace('sb', 'nb') nbdb = sbdb.replace('sb', 'nb')

7
whitebox_neutron_tempest_plugin/tests/scenario/test_multicast.py
View File

@ -797,13 +797,10 @@ class MulticastTestIPv4OvnBase(MulticastTestIPv4, base.BaseTempestTestCaseOvn):
" options:mcast_relay=" + state) " options:mcast_relay=" + state)
def restart_ovn_controller_on_compute_nodes(self): 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: for node in self.nodes:
if node['is_compute'] is True and node['is_controller'] is False: 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) node['client'].exec_command(cmd)
time.sleep(10) time.sleep(10)