X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_parser.py;h=67aec2f8b1c1005f954f2ee35e2c2614326c8ecf;hp=9151cf2f8e0e0f448b130a6d93a469fc65fb80f8;hb=7ece7949b9097e44ae4ce12e4dd8b95da5dfbc49;hpb=7c7cad880bb72b19671fec71b3f5d1350995161e diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index 9151cf2f8e..67aec2f8b1 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -263,8 +263,7 @@ class ExecutionChecker(ResultVisitor): ) REGEX_VERSION_VPP = re.compile( - r"(return STDOUT Version:\s*|" - r"VPP Version:\s*|VPP version:\s*)(.*)" + r"(VPP Version:\s*|VPP version:\s*)(.*)" ) REGEX_VERSION_DPDK = re.compile( r"(DPDK version:\s*|DPDK Version:\s*)(.*)" @@ -287,15 +286,17 @@ class ExecutionChecker(ResultVisitor): ) REGEX_TC_TAG = re.compile(r'\d+[tT]\d+[cC]') - REGEX_TC_NAME_OLD = re.compile(r'-\d+[tT]\d+[cC]-') - REGEX_TC_NAME_NEW = re.compile(r'-\d+[cC]-') REGEX_TC_NUMBER = re.compile(r'tc\d{2}-') REGEX_TC_PAPI_CLI = re.compile(r'.*\((\d+.\d+.\d+.\d+.) - (.*)\)') - def __init__(self, metadata, mapping, ignore, for_output): + REGEX_SH_RUN_HOST = re.compile( + r'hostname=\"(\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3})\",hook=\"(.*)\"' + ) + + def __init__(self, metadata, mapping, ignore, process_oper): """Initialisation. :param metadata: Key-value pairs to be included in "metadata" part of @@ -303,11 +304,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 @@ -328,7 +330,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 @@ -337,6 +339,8 @@ class ExecutionChecker(ResultVisitor): self._conf_history_lookup_nr = 0 self._sh_run_counter = 0 + self._telemetry_kw_counter = 0 + self._telemetry_msg_counter = 0 # Test ID of currently processed test- the lowercase full path to the # test @@ -356,12 +360,12 @@ class ExecutionChecker(ResultVisitor): # Dictionary defining the methods used to parse different types of # messages self.parse_msg = { - u"timestamp": self._get_timestamp, u"vpp-version": self._get_vpp_version, u"dpdk-version": self._get_dpdk_version, u"teardown-papi-history": self._get_papi_history, u"test-show-runtime": self._get_show_run, - u"testbed": self._get_testbed + u"testbed": self._get_testbed, + u"test-telemetry": self._get_telemetry } @property @@ -473,7 +477,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. @@ -494,13 +499,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 = ( @@ -511,11 +516,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 = ( @@ -580,14 +591,14 @@ class ExecutionChecker(ResultVisitor): :returns: Nothing. """ - if msg.message.count(u"return STDOUT Version:") or \ - msg.message.count(u"VPP Version:") or \ - msg.message.count(u"VPP version:"): + if msg.message.count(u"VPP version:") or \ + msg.message.count(u"VPP Version:"): self._version = str( re.search(self.REGEX_VERSION_VPP, msg.message).group(2) ) 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. @@ -607,18 +618,6 @@ class ExecutionChecker(ResultVisitor): finally: self._msg_type = None - def _get_timestamp(self, msg): - """Called when extraction of timestamp is required. - - :param msg: Message to process. - :type msg: Message - :returns: Nothing. - """ - - self._timestamp = msg.timestamp[:14] - self._data[u"metadata"][u"generated"] = self._timestamp - self._msg_type = None - def _get_papi_history(self, msg): """Called when extraction of PAPI command history is required. @@ -688,6 +687,76 @@ class ExecutionChecker(ResultVisitor): } ) + def _get_telemetry(self, msg): + """Called when extraction of VPP telemetry data is required. + + :param msg: Message to process. + :type msg: Message + :returns: Nothing. + """ + + if self._telemetry_kw_counter > 1: + return + if not msg.message.count(u"# TYPE vpp_runtime_calls"): + return + + if u"telemetry-show-run" not in \ + self._data[u"tests"][self._test_id].keys(): + self._data[u"tests"][self._test_id][u"telemetry-show-run"] = dict() + + self._telemetry_msg_counter += 1 + groups = re.search(self.REGEX_SH_RUN_HOST, msg.message) + if not groups: + return + try: + host = groups.group(1) + except (AttributeError, IndexError): + host = u"" + try: + sock = groups.group(2) + except (AttributeError, IndexError): + sock = u"" + runtime = { + u"source_type": u"node", + u"source_id": host, + u"msg_type": u"metric", + u"log_level": u"INFO", + u"timestamp": msg.timestamp, + u"msg": u"show_runtime", + u"host": host, + u"socket": sock, + u"data": list() + } + for line in msg.message.splitlines(): + if not line.startswith(u"vpp_runtime_"): + continue + try: + params, value, timestamp = line.rsplit(u" ", maxsplit=2) + cut = params.index(u"{") + name = params[:cut].split(u"_", maxsplit=2)[-1] + labels = eval( + u"dict" + params[cut:].replace('{', '(').replace('}', ')') + ) + labels[u"graph_node"] = labels.pop(u"name") + runtime[u"data"].append( + { + u"name": name, + u"value": value, + u"timestamp": timestamp, + u"labels": labels + } + ) + except (TypeError, ValueError, IndexError): + continue + self._data[u'tests'][self._test_id][u'telemetry-show-run']\ + [f"dut{self._telemetry_msg_counter}"] = copy.copy( + { + u"host": host, + u"socket": sock, + u"runtime": runtime + } + ) + def _get_ndrpdr_throughput(self, msg): """Get NDR_LOWER, NDR_UPPER, PDR_LOWER and PDR_UPPER from the test message. @@ -973,7 +1042,7 @@ class ExecutionChecker(ResultVisitor): u"level": len(suite.longname.split(u".")) } - suite.keywords.visit(self) + suite.setup.visit(self) def end_suite(self, suite): """Called when suite ends. @@ -991,7 +1060,7 @@ class ExecutionChecker(ResultVisitor): :returns: Nothing. """ if self.start_test(test) is not False: - test.keywords.visit(self) + test.body.visit(self) self.end_test(test) def start_test(self, test): @@ -1003,6 +1072,8 @@ class ExecutionChecker(ResultVisitor): """ self._sh_run_counter = 0 + self._telemetry_kw_counter = 0 + self._telemetry_msg_counter = 0 longname_orig = test.longname.lower() @@ -1057,38 +1128,36 @@ class ExecutionChecker(ResultVisitor): else: test_result[u"msg"] = test.message - if u"PERFTEST" in tags: + if u"PERFTEST" in tags and u"TREX" not 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 # test case names if necessary. - groups = re.search(self.REGEX_TC_NAME_OLD, self._test_id) - if not groups: - tag_count = 0 - tag_tc = str() - for tag in test_result[u"tags"]: - groups = re.search(self.REGEX_TC_TAG, tag) - if groups: - tag_count += 1 - 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 - ) - else: - test_result[u"status"] = u"FAIL" - self._data[u"tests"][self._test_id] = test_result - logging.debug( - f"The test {self._test_id} has no or more than one " - f"multi-threading tags.\n" - f"Tags: {test_result[u'tags']}" - ) - return + tag_count = 0 + tag_tc = str() + for tag in test_result[u"tags"]: + groups = re.search(self.REGEX_TC_TAG, tag) + if groups: + tag_count += 1 + 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 + ) + else: + test_result[u"status"] = u"FAIL" + self._data[u"tests"][self._test_id] = test_result + logging.debug( + f"The test {self._test_id} has no or more than one " + f"multi-threading tags.\n" + f"Tags: {test_result[u'tags']}" + ) + return if u"DEVICETEST" in tags: test_result[u"type"] = u"DEVICETEST" @@ -1132,20 +1201,15 @@ class ExecutionChecker(ResultVisitor): if test.status == u"PASS": test_result[u"throughput"], test_result[u"status"] = \ self._get_plr_throughput(test.message) + elif u"LDP_NGINX" in tags: + test_result[u"type"] = u"LDP_NGINX" + test_result[u"result"], test_result[u"status"] = \ + self._get_vsap_data(test.message, tags) elif u"HOSTSTACK" in tags: test_result[u"type"] = u"HOSTSTACK" if test.status == u"PASS": test_result[u"result"], test_result[u"status"] = \ self._get_hoststack_data(test.message, tags) - elif u"LDP_NGINX" in tags: - test_result[u"type"] = u"LDP_NGINX" - test_result[u"result"], test_result[u"status"] = \ - self._get_vsap_data(test.message, tags) - # elif u"TCP" in tags: # This might be not used - # test_result[u"type"] = u"TCP" - # if test.status == u"PASS": - # groups = re.search(self.REGEX_TCP, test.message) - # test_result[u"result"] = int(groups.group(2)) elif u"RECONF" in tags: test_result[u"type"] = u"RECONF" if test.status == u"PASS": @@ -1215,7 +1279,7 @@ class ExecutionChecker(ResultVisitor): :type test_kw: Keyword :returns: Nothing. """ - for keyword in test_kw.keywords: + for keyword in test_kw.body: if self.start_test_kw(keyword) is not False: self.visit_test_kw(keyword) self.end_test_kw(keyword) @@ -1228,10 +1292,13 @@ class ExecutionChecker(ResultVisitor): :type test_kw: Keyword :returns: Nothing. """ - if ((self._for_output != u"trending") and - (test_kw.name.count(u"Show Runtime On All Duts") or - test_kw.name.count(u"Show Runtime Counters On All Duts") or - test_kw.name.count(u"Vpp Show Runtime On All Duts"))): + if not self._process_oper: + return + + if test_kw.name.count(u"Run Telemetry On All Duts"): + self._msg_type = u"test-telemetry" + self._telemetry_kw_counter += 1 + elif test_kw.name.count(u"Show Runtime On All Duts"): self._msg_type = u"test-show-runtime" self._sh_run_counter += 1 else: @@ -1254,7 +1321,7 @@ class ExecutionChecker(ResultVisitor): :type setup_kw: Keyword :returns: Nothing. """ - for keyword in setup_kw.keywords: + for keyword in setup_kw.setup: if self.start_setup_kw(keyword) is not False: self.visit_setup_kw(keyword) self.end_setup_kw(keyword) @@ -1273,9 +1340,6 @@ class ExecutionChecker(ResultVisitor): elif setup_kw.name.count(u"Install Dpdk Framework On All Duts") and \ not self._version: self._msg_type = u"dpdk-version" - elif setup_kw.name.count(u"Set Global Variable") \ - and not self._timestamp: - self._msg_type = u"timestamp" elif setup_kw.name.count(u"Setup Framework") and not self._testbed: self._msg_type = u"testbed" else: @@ -1298,7 +1362,7 @@ class ExecutionChecker(ResultVisitor): :type teardown_kw: Keyword :returns: Nothing. """ - for keyword in teardown_kw.keywords: + for keyword in teardown_kw.body: if self.start_teardown_kw(keyword) is not False: self.visit_teardown_kw(keyword) self.end_teardown_kw(keyword) @@ -1385,7 +1449,7 @@ class InputData: self._for_output = for_output # Data store: - self._input_data = pd.Series() + self._input_data = pd.Series(dtype="float64") @property def data(self): @@ -1457,11 +1521,30 @@ 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", ): + # 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) + checker.data[u"metadata"][u"tests_total"] = \ + result.statistics.total.total + checker.data[u"metadata"][u"tests_passed"] = \ + result.statistics.total.passed + checker.data[u"metadata"][u"tests_failed"] = \ + result.statistics.total.failed + checker.data[u"metadata"][u"elapsedtime"] = result.suite.elapsedtime + checker.data[u"metadata"][u"generated"] = result.suite.endtime[:14] + return checker.data def _download_and_parse_build(self, job, build, repeat, pid=10000): @@ -1581,7 +1664,7 @@ class InputData: }) if self._input_data.get(job, None) is None: - self._input_data[job] = pd.Series() + 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"] @@ -1660,7 +1743,7 @@ class InputData: }) if self._input_data.get(job, None) is None: - self._input_data[job] = pd.Series() + 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") @@ -1817,12 +1900,12 @@ class InputData: params.extend((u"type", u"status")) data_to_filter = data if data else element[u"data"] - data = pd.Series() + data = pd.Series(dtype="float64") try: for job, builds in data_to_filter.items(): - data[job] = pd.Series() + data[job] = pd.Series(dtype="float64") for build in builds: - data[job][str(build)] = pd.Series() + data[job][str(build)] = pd.Series(dtype="float64") try: data_dict = dict( self.data[job][str(build)][data_set].items()) @@ -1833,7 +1916,8 @@ 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() + data[job][str(build)][test_id] = \ + pd.Series(dtype="float64") if params is None: for param, val in test_data.items(): data[job][str(build)][test_id][param] = val @@ -1917,12 +2001,12 @@ class InputData: else: tests = include - data = pd.Series() + data = pd.Series(dtype="float64") try: for job, builds in element[u"data"].items(): - data[job] = pd.Series() + data[job] = pd.Series(dtype="float64") for build in builds: - data[job][str(build)] = pd.Series() + data[job][str(build)] = pd.Series(dtype="float64") for test in tests: try: reg_ex = re.compile(str(test).lower()) @@ -1931,7 +2015,8 @@ class InputData: if re.match(reg_ex, str(test_id).lower()): test_data = self.data[job][ str(build)][data_set][test_id] - data[job][str(build)][test_id] = pd.Series() + data[job][str(build)][test_id] = \ + pd.Series(dtype="float64") if params is None: for param, val in test_data.items(): data[job][str(build)][test_id]\ @@ -1986,7 +2071,7 @@ class InputData: logging.info(u" Merging data ...") - merged_data = pd.Series() + merged_data = pd.Series(dtype="float64") for builds in data.values: for item in builds.values: for item_id, item_data in item.items(): @@ -2034,8 +2119,8 @@ class InputData: vectors_call = 0.0 if int(item[u"calls"][idx]) + int( - item[u"vectors"][idx]) + \ - int(item[u"suspends"][idx]): + item[u"vectors"][idx]) + \ + int(item[u"suspends"][idx]): threads[idx].append([ item[u"name"], item[u"calls"][idx],