From bc06c338f3add43b65248b7884b653e1119d72e3 Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Fri, 29 Jan 2021 12:22:15 +0100 Subject: [PATCH] Fix OVN test_agents running on devstack environments test_kill_ovn_controller should be skipped on devstack because the ovn-controller process is not started automatically test_restart_ovn_controller was using docker because the ovn-controller service name was wrong Change-Id: Ia3f70a23f676fbbc2b3d129df1fac77bdadfcd29 --- tobiko/openstack/topology/_topology.py | 2 +- tobiko/tests/faults/neutron/test_agents.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tobiko/openstack/topology/_topology.py b/tobiko/openstack/topology/_topology.py index e27ae1a54..84cf92278 100644 --- a/tobiko/openstack/topology/_topology.py +++ b/tobiko/openstack/topology/_topology.py @@ -185,7 +185,7 @@ class OpenStackTopology(tobiko.SharedFixture): neutron.OPENVSWITCH_AGENT: 'devstack@q-agt', neutron.METADATA_AGENT: 'devstack@q-meta', neutron.OVN_METADATA_AGENT: 'devstack@q-ovn-metadata-agent', - neutron.OVN_CONTROLLER: 'devstack@ovn-controller' + neutron.OVN_CONTROLLER: 'ovn-controller' } agent_to_container_name_mappings: typing.Dict[str, str] = {} diff --git a/tobiko/tests/faults/neutron/test_agents.py b/tobiko/tests/faults/neutron/test_agents.py index 4758e46ae..bfb53e51a 100644 --- a/tobiko/tests/faults/neutron/test_agents.py +++ b/tobiko/tests/faults/neutron/test_agents.py @@ -584,6 +584,9 @@ class OvnControllerTest(BaseAgentTest): self.container_name = self.get_agent_container_name( self.agent_name) + if not self.container_name: + self.skipTest(f"Missing container(s): '{self.container_name}'") + for host in hosts: ssh_client = topology.get_openstack_node(hostname=host).ssh_client pid = None