X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_parser.py;h=bae7b5eead9da385d62a53d9c0efc593b2e068eb;hp=835609178c328f42801ea66d6e15fe6289501a5f;hb=d59cb151a877c88b4a4fac28c1e01fa5220c1fb6;hpb=cafb31a9cb66cd4cbd9fe28bfd0ab2b83fec1e5d

diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 835609178c..bae7b5eead 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -19,9 +19,8 @@
 - filter the data using tags,
 """
 
-import multiprocessing
-import os
 import re
+import resource
 import pandas as pd
 import logging
 
@@ -37,7 +36,6 @@ from json import loads
 from jumpavg.AvgStdevMetadataFactory import AvgStdevMetadataFactory
 
 from input_data_files import download_and_unzip_data_file
-from utils import Worker
 
 
 # Separator used in file names
@@ -389,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
@@ -1307,6 +1303,7 @@ class InputData(object):
             for build in builds:
 
                 result = self._download_and_parse_build(job, build, repeat)
+                build_nr = result["build"]["build"]
 
                 if result["data"]:
                     data = result["data"]
@@ -1321,12 +1318,15 @@ class InputData(object):
 
                     if self._input_data.get(job, None) is None:
                         self._input_data[job] = pd.Series()
-                    self._input_data[job][str(build)] = build_data
+                    self._input_data[job][str(build_nr)] = build_data
 
                     self._cfg.set_input_file_name(
-                        job, build, result["build"]["file-name"])
+                        job, build_nr, result["build"]["file-name"])
 
-                self._cfg.set_input_state(job, build, result["state"])
+                self._cfg.set_input_state(job, build_nr, result["state"])
+
+                logging.info("Memory allocation: {0:,d}MB".format(
+                    resource.getrusage(resource.RUSAGE_SELF).ru_maxrss / 1000))
 
         logging.info("Done.")