diff --git a/ci-scripts/cls_corenetwork.py b/ci-scripts/cls_corenetwork.py index 7bb508d86b..579bad585b 100644 --- a/ci-scripts/cls_corenetwork.py +++ b/ci-scripts/cls_corenetwork.py @@ -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__() @@ -162,6 +162,9 @@ class CoreNetwork: def getCmdPrefix(self): return self._cmd_prefix or "" + def getName(self): + return self._cn_name + def getHost(self): return self._host diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py index 51a7108875..cd40c807e1 100644 --- a/ci-scripts/cls_oaicitest.py +++ b/ci-scripts/cls_oaicitest.py @@ -464,7 +464,7 @@ class OaiCiTest(): return (False, f"UE {ue.getName()} has no IP address") svrIP = cn.getIP() if not svrIP: - return (False, f"Iperf server {ue.getName()} has no IP address") + return (False, f"Iperf server {cn.getName()} has no IP address") iperf_opt = self.iperf_args jsonReport = "--json" @@ -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"