Report: Hoststack methodology

[csit.git] / resources / tools / presentation / input_data_parser.py

diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 60c5af2..e4a7a0a 100644 (file)
--- 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.
@@ -421,67 +421,71 @@ class ExecutionChecker(ResultVisitor):
                 robot framework.
             :type in_str_1: str
             :type in_str_2: str
-            :returns: Processed latency string or empty string if a problem
-                occurs.
-            :rtype: tuple(str, str)
+            :returns: Processed latency string or None if a problem occurs.
+            :rtype: tuple
             """
             in_list_1 = in_str_1.split('/', 3)
             in_list_2 = in_str_2.split('/', 3)
 
             if len(in_list_1) != 4 and len(in_list_2) != 4:
-                return u""
+                return None
 
             in_list_1[3] += u"=" * (len(in_list_1[3]) % 4)
             try:
                 hdr_lat_1 = hdrh.histogram.HdrHistogram.decode(in_list_1[3])
             except hdrh.codec.HdrLengthException:
-                return u""
+                return None
 
             in_list_2[3] += u"=" * (len(in_list_2[3]) % 4)
             try:
                 hdr_lat_2 = hdrh.histogram.HdrHistogram.decode(in_list_2[3])
             except hdrh.codec.HdrLengthException:
-                return u""
+                return None
 
             if hdr_lat_1 and hdr_lat_2:
-                hdr_lat_1_50 = hdr_lat_1.get_value_at_percentile(50.0)
-                hdr_lat_1_90 = hdr_lat_1.get_value_at_percentile(90.0)
-                hdr_lat_1_99 = hdr_lat_1.get_value_at_percentile(99.0)
-                hdr_lat_2_50 = hdr_lat_2.get_value_at_percentile(50.0)
-                hdr_lat_2_90 = hdr_lat_2.get_value_at_percentile(90.0)
-                hdr_lat_2_99 = hdr_lat_2.get_value_at_percentile(99.0)
-
-                if (hdr_lat_1_50 + hdr_lat_1_90 + hdr_lat_1_99 +
-                        hdr_lat_2_50 + hdr_lat_2_90 + hdr_lat_2_99):
-                    return (
-                        f"{hdr_lat_1_50} {hdr_lat_1_90} {hdr_lat_1_99}    "
-                        f"{hdr_lat_2_50} {hdr_lat_2_90} {hdr_lat_2_99}"
-                    )
+                hdr_lat = (
+                    hdr_lat_1.get_value_at_percentile(50.0),
+                    hdr_lat_1.get_value_at_percentile(90.0),
+                    hdr_lat_1.get_value_at_percentile(99.0),
+                    hdr_lat_2.get_value_at_percentile(50.0),
+                    hdr_lat_2.get_value_at_percentile(90.0),
+                    hdr_lat_2.get_value_at_percentile(99.0)
+                )
 
-            return u""
+                if all(hdr_lat):
+                    return hdr_lat
+
+            return None
 
         try:
-            pdr_lat_10 = _process_lat(data[u'pdr_lat_10_1'],
-                                      data[u'pdr_lat_10_2'])
-            pdr_lat_50 = _process_lat(data[u'pdr_lat_50_1'],
-                                      data[u'pdr_lat_50_2'])
-            pdr_lat_90 = _process_lat(data[u'pdr_lat_90_1'],
-                                      data[u'pdr_lat_90_2'])
-            pdr_lat_10 = f"\n3. {pdr_lat_10} (10% PDR)" if pdr_lat_10 else u""
-            pdr_lat_50 = f"\n4. {pdr_lat_50} (50% PDR)" if pdr_lat_50 else u""
-            pdr_lat_90 = f"\n5. {pdr_lat_90} (90% PDR)" if pdr_lat_90 else u""
-
-            return (
-                f"1. {(data[u'ndr_low'] / 1e6):.2f} {data[u'ndr_low_b']:.2f} "
-                f"(NDR)"
-                f"\n2. {(data[u'pdr_low'] / 1e6):.2f} {data[u'pdr_low_b']:.2f} "
-                f"(PDR)"
-                f"{pdr_lat_10}"
-                f"{pdr_lat_50}"
-                f"{pdr_lat_90}"
+            out_msg = (
+                f"1. {(data[u'ndr_low'] / 1e6):.2f}      "
+                f"{data[u'ndr_low_b']:.2f}"
+                f"\n2. {(data[u'pdr_low'] / 1e6):.2f}      "
+                f"{data[u'pdr_low_b']:.2f}"
+            )
+            latency = (
+                _process_lat(data[u'pdr_lat_10_1'], data[u'pdr_lat_10_2']),
+                _process_lat(data[u'pdr_lat_50_1'], data[u'pdr_lat_50_2']),
+                _process_lat(data[u'pdr_lat_90_1'], data[u'pdr_lat_90_2'])
             )
+            if all(latency):
+                max_len = len(str(max((max(item) for item in latency))))
+
+                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)
+
+            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.