From d59cb151a877c88b4a4fac28c1e01fa5220c1fb6 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Tue, 13 Aug 2019 12:24:18 +0200 Subject: [PATCH] PAL: Get TG IP address from output_info.xml Change-Id: I566c0e436fbe50e5e72da35be6a2afc81e8a33b6 Signed-off-by: Tibor Frank (cherry picked from commit b763901692e207a8f07386bb3bcba254cdeaa790) --- resources/tools/presentation/input_data_parser.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index 3b3be9f1cd..bae7b5eead 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -387,14 +387,12 @@ class ExecutionChecker(ResultVisitor): :returns: Nothing. """ - if msg.message.count("Arguments:"): - message = str(msg.message).replace(' ', '').replace('\n', '').\ - replace("'", '"').replace('b"', '"').\ - replace("honeycom", "honeycomb") - message = loads(message[11:-1]) + if msg.message.count("Setup of TG node"): + reg_tg_ip = re.compile( + r'Setup of TG node (\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}) done') try: - self._testbed = message["TG"]["host"] - except (KeyError, ValueError): + self._testbed = str(re.search(reg_tg_ip, msg.message).group(1)) + except (KeyError, ValueError, IndexError, AttributeError): pass finally: self._data["metadata"]["testbed"] = self._testbed -- 2.16.6