Merge "Properly skip Metadata tests in deployment without containers"
This commit is contained in:
commit
d0bf0ad58d
|
@ -20,6 +20,7 @@ from tobiko.openstack.topology import _topology
|
||||||
NoSuchOpenStackTopologyNodeGroup = _exception.NoSuchOpenStackTopologyNodeGroup
|
NoSuchOpenStackTopologyNodeGroup = _exception.NoSuchOpenStackTopologyNodeGroup
|
||||||
NoSuchOpenStackTopologyNode = _exception.NoSuchOpenStackTopologyNode
|
NoSuchOpenStackTopologyNode = _exception.NoSuchOpenStackTopologyNode
|
||||||
|
|
||||||
|
UnknowOpenStackContainerNameError = _topology.UnknowOpenStackContainerNameError
|
||||||
UnknowOpenStackServiceNameError = _topology.UnknowOpenStackServiceNameError
|
UnknowOpenStackServiceNameError = _topology.UnknowOpenStackServiceNameError
|
||||||
get_agent_service_name = _topology.get_agent_service_name
|
get_agent_service_name = _topology.get_agent_service_name
|
||||||
get_agent_container_name = _topology.get_agent_container_name
|
get_agent_container_name = _topology.get_agent_container_name
|
||||||
|
|
|
@ -67,14 +67,19 @@ class BaseAgentTest(testtools.TestCase):
|
||||||
else:
|
else:
|
||||||
return 'docker'
|
return 'docker'
|
||||||
|
|
||||||
|
def get_agent_container_name(self, agent_name):
|
||||||
|
try:
|
||||||
|
return topology.get_agent_container_name(agent_name)
|
||||||
|
except topology.UnknowOpenStackContainerNameError:
|
||||||
|
LOG.debug(
|
||||||
|
'Network agents are not contenerized on this environment')
|
||||||
|
return
|
||||||
|
|
||||||
def get_ovn_agents_from_containers(self):
|
def get_ovn_agents_from_containers(self):
|
||||||
if not self.agents:
|
if not self.agents:
|
||||||
try:
|
self.container_name = self.get_agent_container_name(
|
||||||
self.container_name = \
|
self.agent_name)
|
||||||
topology.get_agent_container_name(self.agent_name)
|
if not self.container_name:
|
||||||
except KeyError:
|
|
||||||
LOG.debug('OVN network agents are not containerized on this'
|
|
||||||
'environment')
|
|
||||||
return
|
return
|
||||||
oc_containers_df = containers.list_containers_df().query(
|
oc_containers_df = containers.list_containers_df().query(
|
||||||
f'container_name == "{self.container_name}"')
|
f'container_name == "{self.container_name}"')
|
||||||
|
@ -115,7 +120,7 @@ class BaseAgentTest(testtools.TestCase):
|
||||||
f"'{host}'.")
|
f"'{host}'.")
|
||||||
else:
|
else:
|
||||||
if self.container_name == '':
|
if self.container_name == '':
|
||||||
self.container_name = topology.get_agent_container_name(
|
self.container_name = self.get_agent_container_name(
|
||||||
self.agent_name)
|
self.agent_name)
|
||||||
LOG.debug(f'Stopping container {self.container_name} on '
|
LOG.debug(f'Stopping container {self.container_name} on '
|
||||||
f"host '{host}'...")
|
f"host '{host}'...")
|
||||||
|
@ -152,7 +157,7 @@ class BaseAgentTest(testtools.TestCase):
|
||||||
sudo=True)
|
sudo=True)
|
||||||
else:
|
else:
|
||||||
if self.container_name == '':
|
if self.container_name == '':
|
||||||
self.container_name = topology.get_agent_container_name(
|
self.container_name = self.get_agent_container_name(
|
||||||
self.agent_name)
|
self.agent_name)
|
||||||
LOG.debug(f'Starting container {self.container_name} on '
|
LOG.debug(f'Starting container {self.container_name} on '
|
||||||
f"host '{host}'...")
|
f"host '{host}'...")
|
||||||
|
@ -175,8 +180,10 @@ class BaseAgentTest(testtools.TestCase):
|
||||||
self.assertNotEqual([], hosts, "Host list is empty")
|
self.assertNotEqual([], hosts, "Host list is empty")
|
||||||
|
|
||||||
self.container_name = (self.container_name or
|
self.container_name = (self.container_name or
|
||||||
topology.get_agent_container_name(
|
self.get_agent_container_name(
|
||||||
self.agent_name))
|
self.agent_name))
|
||||||
|
if not self.container_name:
|
||||||
|
self.skipTest(f"Missing container(s): '{self.container_name}'")
|
||||||
|
|
||||||
for host in hosts:
|
for host in hosts:
|
||||||
ssh_client = topology.get_openstack_node(hostname=host).ssh_client
|
ssh_client = topology.get_openstack_node(hostname=host).ssh_client
|
||||||
|
@ -574,7 +581,7 @@ class OvnControllerTest(BaseAgentTest):
|
||||||
self.assertNotEqual([], hosts, "Host list is empty")
|
self.assertNotEqual([], hosts, "Host list is empty")
|
||||||
|
|
||||||
if self.container_name == '':
|
if self.container_name == '':
|
||||||
self.container_name = topology.get_agent_container_name(
|
self.container_name = self.get_agent_container_name(
|
||||||
self.agent_name)
|
self.agent_name)
|
||||||
|
|
||||||
for host in hosts:
|
for host in hosts:
|
||||||
|
|
Loading…
Reference in New Issue