CoreNetwork: do not look up IP for CN name printing

In various places, e.g., during initialization (before deployment), we
use the name of the CN object, previously including the IP address.
However, the IP might not be available (because the CN is not deployed),
so we would get warnings at this stage. Avoid this by not looking up the
IP.

There is now one place where we have to look up the IP address
separately.

Also, the exception in initialization might be misleading if we used
{self}, because we complain about no node being present, but the {self}
would include a non-existing node name => do not use it.
This commit is contained in:
Robert Schmidt
2025-04-11 14:17:50 +02:00
parent 2ab747eaa6
commit 135b522cf4
2 changed files with 3 additions and 3 deletions

View File

@@ -49,7 +49,7 @@ class CoreNetwork:
self._host = c.get('Host').strip()
if self._host == "%%current_host%%":
if node is None:
raise Exception(f"core network {self} requires node, but none provided (cannot replace %%current_host%%)")
raise Exception(f"core network {cn_name} requires node, but none provided (cannot replace %%current_host%%)")
self._host = node
if d is not None:
raise Exception("directory handling not implemented")
@@ -66,7 +66,7 @@ class CoreNetwork:
logging.info(f'initialized core {self} from {filename}')
def __str__(self):
return f"{self._cn_name}@{self._host} [IP: {self.getIP()}]"
return f"{self._cn_name}@{self._host}"
def __repr__(self):
return self.__str__()

View File

@@ -862,7 +862,7 @@ class OaiCiTest():
success, output = cn.deploy()
logging.info(f"deployment core network {core_name} success {success}, output:\n{output}")
if success:
msg = f"Started {cn}"
msg = f"Started {cn} [{cn.getIP()}]"
HTML.CreateHtmlTestRowQueue(core_name, 'OK', [msg])
else:
msg = f"deployment of core network {core_name} FAILED"