x/tobiko
Code Issues Proposed changes

Merge "Fix comparable_container_keys when the socket file includes hostname"

Browse Source
This commit is contained in:
Zuul 2024-06-28 14:47:40 +00:00 committed by Gerrit Code Review
commit ef56bb1153
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tobiko/podified/containers.py
View File

@ -202,15 +202,19 @@ def comparable_container_keys(container, include_container_objects=False):
"""returns the tuple : 'container_host','container_name', """returns the tuple : 'container_host','container_name',
'container_state, container object if specified' 'container_state, container object if specified'
""" """
host_or_ip = container.client.base_url.netloc.rsplit('_')[1]
nodes_matching = topology.list_openstack_nodes(hostnames=[host_or_ip])
nodename = (nodes_matching[0].name
if nodes_matching
else rhosp_topology.ip_to_hostname(host_or_ip))
# Differenciate between podman_ver3 with podman-py from earlier api # Differenciate between podman_ver3 with podman-py from earlier api
if include_container_objects: if include_container_objects:
return (rhosp_topology.ip_to_hostname( return (nodename,
container.client.base_url.netloc.rsplit('_')[1]),
container.attrs['Names'][0], container.attrs['State'], container.attrs['Names'][0], container.attrs['State'],
container) container)
else: else:
return (rhosp_topology.ip_to_hostname( return (nodename,
container.client.base_url.netloc.rsplit('_')[1]),
container.attrs['Names'][0], container.attrs['Names'][0],
container.attrs['State']) container.attrs['State'])