PAL: vpp_version

Change-Id: Id01389d5bac005b0812182551053f354511e24d1
Signed-off-by: Tibor Frank <tifrank@cisco.com>

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 82e59c4..1439c4a 100644 (file)
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -2176,6 +2176,7 @@ def table_weekly_comparison(table, in_data):
             header[1].insert(
                 1, in_data.metadata(job_name, build_nr).get(u"generated", u"")
             )
+            logging.info(in_data.metadata(job_name, build_nr).get(u"version", u"ERROR"))
             header[0].insert(
                 1, in_data.metadata(job_name, build_nr).get(u"version", u"")
             )
@@ -2219,9 +2220,7 @@ def table_weekly_comparison(table, in_data):
             if ref_data is None or cmp_data is None:
                 cmp_dict[tst_name].append(float(u'nan'))
             else:
-                cmp_dict[tst_name].append(
-                    relative_change(ref_data, cmp_data)
-                )
+                cmp_dict[tst_name].append(relative_change(ref_data, cmp_data))
 
     tbl_lst_none = list()
     tbl_lst = list()

diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 7499935..ecc4030 100644 (file)
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -600,6 +600,7 @@ class ExecutionChecker(ResultVisitor):
             )
             self._data[u"metadata"][u"version"] = self._version
             self._msg_type = None
+            logging.info(self._version)
 
     def _get_dpdk_version(self, msg):
         """Called when extraction of DPDK version is required.
@@ -1450,7 +1451,7 @@ class InputData:
         self._for_output = for_output
 
         # Data store:
-        self._input_data = pd.Series(dtype="object")
+        self._input_data = pd.Series(dtype="float64")
 
     @property
     def data(self):
@@ -1665,7 +1666,7 @@ class InputData:
                     })
 
                     if self._input_data.get(job, None) is None:
-                        self._input_data[job] = pd.Series(dtype="object")
+                        self._input_data[job] = pd.Series(dtype="float64")
                     self._input_data[job][str(build_nr)] = build_data
                     self._cfg.set_input_file_name(
                         job, build_nr, result[u"build"][u"file-name"]
@@ -1744,7 +1745,7 @@ class InputData:
         })
 
         if self._input_data.get(job, None) is None:
-            self._input_data[job] = pd.Series(dtype="object")
+            self._input_data[job] = pd.Series(dtype="float64")
         self._input_data[job][str(build_nr)] = build_data
 
         self._cfg.set_input_state(job, build_nr, u"processed")
@@ -1901,12 +1902,12 @@ class InputData:
                 params.extend((u"type", u"status"))
 
         data_to_filter = data if data else element[u"data"]
-        data = pd.Series(dtype="object")
+        data = pd.Series(dtype="float64")
         try:
             for job, builds in data_to_filter.items():
-                data[job] = pd.Series(dtype="object")
+                data[job] = pd.Series(dtype="float64")
                 for build in builds:
-                    data[job][str(build)] = pd.Series(dtype="object")
+                    data[job][str(build)] = pd.Series(dtype="float64")
                     try:
                         data_dict = dict(
                             self.data[job][str(build)][data_set].items())
@@ -1918,7 +1919,7 @@ class InputData:
                     for test_id, test_data in data_dict.items():
                         if eval(cond, {u"tags": test_data.get(u"tags", u"")}):
                             data[job][str(build)][test_id] = \
-                                pd.Series(dtype="object")
+                                pd.Series(dtype="float64")
                             if params is None:
                                 for param, val in test_data.items():
                                     data[job][str(build)][test_id][param] = val
@@ -2002,12 +2003,12 @@ class InputData:
         else:
             tests = include
 
-        data = pd.Series(dtype="object")
+        data = pd.Series(dtype="float64")
         try:
             for job, builds in element[u"data"].items():
-                data[job] = pd.Series(dtype="object")
+                data[job] = pd.Series(dtype="float64")
                 for build in builds:
-                    data[job][str(build)] = pd.Series(dtype="object")
+                    data[job][str(build)] = pd.Series(dtype="float64")
                     for test in tests:
                         try:
                             reg_ex = re.compile(str(test).lower())
@@ -2017,7 +2018,7 @@ class InputData:
                                     test_data = self.data[job][
                                         str(build)][data_set][test_id]
                                     data[job][str(build)][test_id] = \
-                                        pd.Series(dtype="object")
+                                        pd.Series(dtype="float64")
                                     if params is None:
                                         for param, val in test_data.items():
                                             data[job][str(build)][test_id]\
@@ -2072,7 +2073,7 @@ class InputData:
 
         logging.info(u"    Merging data ...")
 
-        merged_data = pd.Series(dtype="object")
+        merged_data = pd.Series(dtype="float64")
         for builds in data.values:
             for item in builds.values:
                 for item_id, item_data in item.items():

diff --git a/resources/tools/presentation/specifications/trending/environment.yaml b/resources/tools/presentation/specifications/trending/environment.yaml
index f842775..b2e8cc6 100644 (file)
--- a/resources/tools/presentation/specifications/trending/environment.yaml
+++ b/resources/tools/presentation/specifications/trending/environment.yaml
@@ -51,13 +51,13 @@
   - "DIR[BUILD,HTML]"
 
   testbeds:
-    "10.32.51.74": "LF-3n-ALT-34"
-    "10.32.51.82": "LF-2n-ICX-212"
-    "10.32.51.84": "LF-2n-ICX-213"
-    "10.32.51.86": "LF-2n-ICX-214"
-    "10.32.51.88": "LF-2n-ICX-215"
-    "10.32.51.77": "LF-3n-ICX-37"
-    "10.32.51.80": "LF-3n-ICX-38"
+    "10.30.51.74": "LF-3n-ALT-34"
+    "10.30.51.82": "LF-2n-ICX-212"
+    "10.30.51.84": "LF-2n-ICX-213"
+    "10.30.51.86": "LF-2n-ICX-214"
+    "10.30.51.88": "LF-2n-ICX-215"
+    "10.30.51.77": "LF-3n-ICX-37"
+    "10.30.51.80": "LF-3n-ICX-38"
     "10.30.51.45": "LF-2n-SKX-21"
     "10.30.51.53": "LF-2n-SKX-22"
     "10.30.51.55": "LF-2n-SKX-23"