diff --git a/whitebox_neutron_tempest_plugin/config.py b/whitebox_neutron_tempest_plugin/config.py index d0fcf5d..9589cea 100644 --- a/whitebox_neutron_tempest_plugin/config.py +++ b/whitebox_neutron_tempest_plugin/config.py @@ -203,5 +203,12 @@ WhiteboxNeutronPluginOptions = [ cfg.IntOpt('servers_count', default=12, help='How many tenant VMs should be tested when many needed ' - '(default value meant for cirros image).') + '(default value meant for cirros image).'), + cfg.DictOpt('dataplane_podified_services', + default={'ovn controller': 'edpm_ovn_controller', + 'ovn metadata agent': 'edpm_ovn_metadata_agent', + 'ovs vswitchd': 'ovs-vswitchd'}, + help='configurable names for dataplane services running on ' + 'podified setups') + ] diff --git a/whitebox_neutron_tempest_plugin/tests/scenario/base.py b/whitebox_neutron_tempest_plugin/tests/scenario/base.py index 7188953..81fec33 100644 --- a/whitebox_neutron_tempest_plugin/tests/scenario/base.py +++ b/whitebox_neutron_tempest_plugin/tests/scenario/base.py @@ -581,7 +581,10 @@ class BaseTempestWhiteboxTestCase(base.BaseTempestTestCase): def reset_node_service(cls, service_alias, ssh_client, wait_until_active=True, timeout=30): host_ip = ssh_client.host - service_name = ssh_client.exec_command( + service_name = (None if WB_CONF.openstack_type != 'podified' + else WB_CONF.dataplane_podified_services.get( + service_alias)) + service_name = service_name or ssh_client.exec_command( "systemctl list-unit-files --type service | grep {}.service | " "cut -d' ' -f1".format( service_alias.replace(" ", ".*"))).strip()