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

Merge "Remove any tripleo/director related code in plugin"

Browse Source
This commit is contained in:
Zuul 2024-03-14 22:05:22 +00:00 committed by Gerrit Code Review
commit 46de9d814c
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
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')

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)
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)