X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_parser.py;h=bb802b3d830605dee38cd796f30c17406f57c872;hb=e482650cf7335d9895b3af47d90e001c9c2c8560;hp=db1fc5a0925853687f7940c1381c098842a5bfa3;hpb=8ca63f49d365d589af2a6667cfdceda098b677cc;p=csit.git

diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index db1fc5a092..bb802b3d83 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -368,12 +368,12 @@ class ExecutionChecker(ResultVisitor):
 
         groups = re.search(self.REGEX_MRR_MSG_INFO, msg)
         if not groups or groups.lastindex != 1:
-            return msg
+            return u"Test Failed."
 
         try:
             data = groups.group(1).split(u", ")
         except (AttributeError, IndexError, ValueError, KeyError):
-            return msg
+            return u"Test Failed."
 
         out_str = u"["
         try:
@@ -381,7 +381,7 @@ class ExecutionChecker(ResultVisitor):
                 out_str += f"{(float(item) / 1e6):.2f}, "
             return out_str[:-2] + u"]"
         except (AttributeError, IndexError, ValueError, KeyError):
-            return msg
+            return u"Test Failed."
 
     def _get_data_from_perf_test_msg(self, msg):
         """Get info from message of NDRPDR performance tests.
@@ -394,7 +394,7 @@ class ExecutionChecker(ResultVisitor):
 
         groups = re.search(self.REGEX_PERF_MSG_INFO, msg)
         if not groups or groups.lastindex != 10:
-            return msg
+            return u"Test Failed."
 
         try:
             data = {
@@ -410,7 +410,7 @@ class ExecutionChecker(ResultVisitor):
                 u"pdr_lat_10_2": groups.group(10),
             }
         except (AttributeError, IndexError, ValueError, KeyError):
-            return msg
+            return u"Test Failed."
 
         def _process_lat(in_str_1, in_str_2):
             """Extract min, avg, max values from latency string.
@@ -459,9 +459,9 @@ class ExecutionChecker(ResultVisitor):
 
         try:
             out_msg = (
-                f"1. {(data[u'ndr_low'] / 1e6):.2f}      "
+                f"1. {(data[u'ndr_low'] / 1e6):5.2f}      "
                 f"{data[u'ndr_low_b']:.2f}"
-                f"\n2. {(data[u'pdr_low'] / 1e6):.2f}      "
+                f"\n2. {(data[u'pdr_low'] / 1e6):5.2f}      "
                 f"{data[u'pdr_low_b']:.2f}"
             )
             latency = (
@@ -471,21 +471,25 @@ class ExecutionChecker(ResultVisitor):
             )
             if all(latency):
                 max_len = len(str(max((max(item) for item in latency))))
+                max_len = 4 if max_len < 4 else max_len
 
                 for idx, lat in enumerate(latency):
                     if not idx:
                         out_msg += u"\n"
-                    out_msg += f"\n{idx + 3}. "
-                    for count, itm in enumerate(lat):
-                        if count == 3:
-                            out_msg += u" " * 6
-                        out_msg += u" " * (max_len - len(str(itm)) + 1)
-                        out_msg += str(itm)
+                    out_msg += (
+                        f"\n{idx + 3}. "
+                        f"{lat[0]:{max_len}d} "
+                        f"{lat[1]:{max_len}d} "
+                        f"{lat[2]:{max_len}d}      "
+                        f"{lat[3]:{max_len}d} "
+                        f"{lat[4]:{max_len}d} "
+                        f"{lat[5]:{max_len}d} "
+                    )
 
             return out_msg
 
         except (AttributeError, IndexError, ValueError, KeyError):
-            return msg
+            return u"Test Failed."
 
     def _get_testbed(self, msg):
         """Called when extraction of testbed IP is required.
@@ -974,13 +978,24 @@ class ExecutionChecker(ResultVisitor):
             replace(u'\r', u'').\
             replace(u'[', u' |br| [').\
             replace(u' |br| [', u'[', 1)
-        test_result[u"msg"] = test.message.\
-            replace(u'\n', u' |br| ').\
-            replace(u'\r', u'').\
-            replace(u'"', u"'")
         test_result[u"type"] = u"FUNC"
         test_result[u"status"] = test.status
 
+        if test.status == u"PASS":
+            if u"NDRPDR" in tags:
+                test_result[u"msg"] = self._get_data_from_perf_test_msg(
+                    test.message).replace(u'\n', u' |br| ').\
+                    replace(u'\r', u'').replace(u'"', u"'")
+            elif u"MRR" in tags or u"FRMOBL" in tags or u"BMRR" in tags:
+                test_result[u"msg"] = self._get_data_from_mrr_test_msg(
+                    test.message).replace(u'\n', u' |br| ').\
+                    replace(u'\r', u'').replace(u'"', u"'")
+            else:
+                test_result[u"msg"] = test.message.replace(u'\n', u' |br| ').\
+                    replace(u'\r', u'').replace(u'"', u"'")
+        else:
+            test_result[u"msg"] = u"Test Failed."
+
         if u"PERFTEST" in tags:
             # Replace info about cores (e.g. -1c-) with the info about threads
             # and cores (e.g. -1t1c-) in the long test case names and in the
@@ -996,14 +1011,14 @@ class ExecutionChecker(ResultVisitor):
                         tag_tc = tag
 
                 if tag_count == 1:
-                    self._test_id = re.sub(self.REGEX_TC_NAME_NEW,
-                                           f"-{tag_tc.lower()}-",
-                                           self._test_id,
-                                           count=1)
-                    test_result[u"name"] = re.sub(self.REGEX_TC_NAME_NEW,
-                                                  f"-{tag_tc.lower()}-",
-                                                  test_result["name"],
-                                                  count=1)
+                    self._test_id = re.sub(
+                        self.REGEX_TC_NAME_NEW, f"-{tag_tc.lower()}-",
+                        self._test_id, count=1
+                    )
+                    test_result[u"name"] = re.sub(
+                        self.REGEX_TC_NAME_NEW, f"-{tag_tc.lower()}-",
+                        test_result["name"], count=1
+                    )
                 else:
                     test_result[u"status"] = u"FAIL"
                     self._data[u"tests"][self._test_id] = test_result
@@ -1016,11 +1031,6 @@ class ExecutionChecker(ResultVisitor):
 
         if test.status == u"PASS":
             if u"NDRPDR" in tags:
-                test_result[u"msg"] = self._get_data_from_perf_test_msg(
-                    test.message). \
-                    replace(u'\n', u' |br| '). \
-                    replace(u'\r', u''). \
-                    replace(u'"', u"'")
                 test_result[u"type"] = u"NDRPDR"
                 test_result[u"throughput"], test_result[u"status"] = \
                     self._get_ndrpdr_throughput(test.message)
@@ -1035,11 +1045,6 @@ class ExecutionChecker(ResultVisitor):
                 groups = re.search(self.REGEX_TCP, test.message)
                 test_result[u"result"] = int(groups.group(2))
             elif u"MRR" in tags or u"FRMOBL" in tags or u"BMRR" in tags:
-                test_result[u"msg"] = self._get_data_from_mrr_test_msg(
-                    test.message). \
-                    replace(u'\n', u' |br| '). \
-                    replace(u'\r', u''). \
-                    replace(u'"', u"'")
                 if u"MRR" in tags:
                     test_result[u"type"] = u"MRR"
                 else: