X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_parser.py;h=325e28cf6069ccc80369e6a4e515a341f697db29;hp=8747f938a90fbabd3b8a9e1694ce24ab6d87dd46;hb=c564c79f4aa329ef1df8ef732e7971ab968acfbc;hpb=7bd576415bbc25c00d9f5dd1b4cd19482432718f diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index 8747f938a9..325e28cf60 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -297,7 +297,7 @@ class ExecutionChecker(ResultVisitor): r'hostname=\"(\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3})\",hook=\"(.*)\"' ) - def __init__(self, metadata, mapping, ignore, for_output): + def __init__(self, metadata, mapping, ignore, process_oper): """Initialisation. :param metadata: Key-value pairs to be included in "metadata" part of @@ -305,11 +305,12 @@ class ExecutionChecker(ResultVisitor): :param mapping: Mapping of the old names of test cases to the new (actual) one. :param ignore: List of TCs to be ignored. - :param for_output: Output to be generated from downloaded data. + :param process_oper: If True, operational data (show run, telemetry) is + processed. :type metadata: dict :type mapping: dict :type ignore: list - :type for_output: str + :type process_oper: bool """ # Type of message to parse out from the test messages @@ -330,7 +331,7 @@ class ExecutionChecker(ResultVisitor): # Ignore list self._ignore = ignore - self._for_output = for_output + self._process_oper = process_oper # Number of PAPI History messages found: # 0 - no message @@ -477,7 +478,8 @@ class ExecutionChecker(ResultVisitor): return u"Test Failed." def _process_lat(in_str_1, in_str_2): - """Extract min, avg, max values from latency string. + """Extract P50, P90 and P99 latencies or min, avg, max values from + latency string. :param in_str_1: Latency string for one direction produced by robot framework. @@ -498,13 +500,13 @@ class ExecutionChecker(ResultVisitor): try: hdr_lat_1 = hdrh.histogram.HdrHistogram.decode(in_list_1[3]) except hdrh.codec.HdrLengthException: - return None + hdr_lat_1 = 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 None + hdr_lat_2 = None if hdr_lat_1 and hdr_lat_2: hdr_lat = ( @@ -515,11 +517,17 @@ class ExecutionChecker(ResultVisitor): hdr_lat_2.get_value_at_percentile(90.0), hdr_lat_2.get_value_at_percentile(99.0) ) - if all(hdr_lat): return hdr_lat - return None + hdr_lat = ( + int(in_list_1[0]), int(in_list_1[1]), int(in_list_1[2]), + int(in_list_2[0]), int(in_list_2[1]), int(in_list_2[2]) + ) + for item in hdr_lat: + if item in (-1, 4294967295, 0): + return None + return hdr_lat try: out_msg = ( @@ -1290,7 +1298,7 @@ class ExecutionChecker(ResultVisitor): :type test_kw: Keyword :returns: Nothing. """ - if self._for_output == u"trending": + if not self._process_oper: return if test_kw.name.count(u"Run Telemetry On All Duts"): @@ -1519,8 +1527,18 @@ class InputData: f"Error occurred while parsing output.xml: {repr(err)}" ) return None + + process_oper = False + if u"-vpp-perf-report-coverage-" in job: + process_oper = True + elif u"-vpp-perf-report-iterative-" in job: + # Exceptions for TBs where we do not have coverage data: + for item in (u"-2n-icx", u"-2n-aws", u"-3n-aws"): + if item in job: + process_oper = True + break checker = ExecutionChecker( - metadata, self._cfg.mapping, self._cfg.ignore, self._for_output + metadata, self._cfg.mapping, self._cfg.ignore, process_oper ) result.visit(checker)