X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_parser.py;h=57ec935de1a73f43bea87a2175b78a415d45f6e8;hp=beec34c1067e2006327fec139597b4bfb70e0b0c;hb=28ac3a22615e19cafa7358508a24a9bd9b287544;hpb=6f5de201aadfbb31419c05dfae6495107a745899 diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index beec34c106..57ec935de1 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -16,6 +16,7 @@ - extract data from output.xml files generated by Jenkins jobs and store in pandas' Series, - provide access to the data. +- filter the data using tags, """ import multiprocessing @@ -29,6 +30,7 @@ from robot import errors from collections import OrderedDict from string import replace from os import remove +from jumpavg.AvgStdevMetadataFactory import AvgStdevMetadataFactory from input_data_files import download_and_unzip_data_file from utils import Worker @@ -42,18 +44,21 @@ class ExecutionChecker(ResultVisitor): Performance tests: { - "metadata": { # Optional - "version": "VPP version", + "metadata": { + "generated": "Timestamp", + "version": "SUT version", "job": "Jenkins job name", "build": "Information about the build" }, "suites": { - "Suite name 1": { + "Suite long name 1": { + "name": Suite name, "doc": "Suite 1 documentation", "parent": "Suite 1 parent", "level": "Level of the suite in the suite hierarchy" } - "Suite name N": { + "Suite long name N": { + "name": Suite name, "doc": "Suite N documentation", "parent": "Suite 2 parent", "level": "Level of the suite in the suite hierarchy" @@ -66,12 +71,12 @@ class ExecutionChecker(ResultVisitor): "doc": "Test documentation" "msg": "Test message" "tags": ["tag 1", "tag 2", "tag n"], - "type": "PDR" | "NDR", - "throughput": { + "type": "PDR" | "NDR" | "TCP" | "MRR" | "BMRR", + "throughput": { # Only type: "PDR" | "NDR" "value": int, "unit": "pps" | "bps" | "percentage" }, - "latency": { + "latency": { # Only type: "PDR" | "NDR" "direction1": { "100": { "min": int, @@ -107,9 +112,15 @@ class ExecutionChecker(ResultVisitor): } } }, - "lossTolerance": "lossTolerance", # Only for PDR - "vat-history": "DUT1 and DUT2 VAT History" + "result": { # Only type: "TCP" + "value": int, + "unit": "cps" | "rps" }, + "result": { # Only type: "MRR" | "BMRR" + "receive-rate": AvgStdevMetadata, + }, + "lossTolerance": "lossTolerance", # Only type: "PDR" + "vat-history": "DUT1 and DUT2 VAT History" "show-run": "Show Run" }, "ID" { @@ -118,8 +129,8 @@ class ExecutionChecker(ResultVisitor): } } - Functional tests: + Functional tests: { "metadata": { # Optional @@ -162,7 +173,7 @@ class ExecutionChecker(ResultVisitor): REGEX_RATE = re.compile(r'^[\D\d]*FINAL_RATE:\s(\d+\.\d+)\s(\w+)') REGEX_LAT_NDR = re.compile(r'^[\D\d]*' - r'LAT_\d+%NDR:\s\[\'(-?\d+\/-?\d+/-?\d+)\',' + r'LAT_\d+%NDR:\s\[\'(-?\d+/-?\d+/-?\d+)\',' r'\s\'(-?\d+/-?\d+/-?\d+)\'\]\s\n' r'LAT_\d+%NDR:\s\[\'(-?\d+/-?\d+/-?\d+)\',' r'\s\'(-?\d+/-?\d+/-?\d+)\'\]\s\n' @@ -176,13 +187,24 @@ class ExecutionChecker(ResultVisitor): REGEX_TOLERANCE = re.compile(r'^[\D\d]*LOSS_ACCEPTANCE:\s(\d*\.\d*)\s' r'[\D\d]*') - REGEX_VERSION = re.compile(r"(return STDOUT Version:\s*)(.*)") + REGEX_VERSION_VPP = re.compile(r"(return STDOUT Version:\s*)(.*)") + + REGEX_VERSION_DPDK = re.compile(r"(return STDOUT testpmd)([\d\D\n]*)" + r"(RTE Version: 'DPDK )(.*)(')") REGEX_TCP = re.compile(r'Total\s(rps|cps|throughput):\s([0-9]*).*$') REGEX_MRR = re.compile(r'MaxReceivedRate_Results\s\[pkts/(\d*)sec\]:\s' r'tx\s(\d*),\srx\s(\d*)') + REGEX_BMRR = re.compile(r'Maximum Receive Rate Results \[(.*)\]') + + 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]-') + def __init__(self, metadata): """Initialisation. @@ -197,6 +219,9 @@ class ExecutionChecker(ResultVisitor): # VPP version self._version = None + # Timestamp + self._timestamp = None + # Number of VAT History messages found: # 0 - no message # 1 - VAT History of DUT1 @@ -227,7 +252,9 @@ class ExecutionChecker(ResultVisitor): # Dictionary defining the methods used to parse different types of # messages self.parse_msg = { - "setup-version": self._get_version, + "timestamp": self._get_timestamp, + "vpp-version": self._get_vpp_version, + "dpdk-version": self._get_dpdk_version, "teardown-vat-history": self._get_vat_history, "test-show-runtime": self._get_show_run } @@ -241,7 +268,7 @@ class ExecutionChecker(ResultVisitor): """ return self._data - def _get_version(self, msg): + def _get_vpp_version(self, msg): """Called when extraction of VPP version is required. :param msg: Message to process. @@ -250,12 +277,41 @@ class ExecutionChecker(ResultVisitor): """ if msg.message.count("return STDOUT Version:"): - self._version = str(re.search(self.REGEX_VERSION, msg.message). + self._version = str(re.search(self.REGEX_VERSION_VPP, msg.message). group(2)) self._data["metadata"]["version"] = self._version - self._data["metadata"]["generated"] = msg.timestamp self._msg_type = None + def _get_dpdk_version(self, msg): + """Called when extraction of DPDK version is required. + + :param msg: Message to process. + :type msg: Message + :returns: Nothing. + """ + + if msg.message.count("return STDOUT testpmd"): + try: + self._version = str(re.search( + self.REGEX_VERSION_DPDK, msg.message). group(4)) + self._data["metadata"]["version"] = self._version + except IndexError: + pass + 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["metadata"]["generated"] = self._timestamp + self._msg_type = None + def _get_vat_history(self, msg): """Called when extraction of VAT command history is required. @@ -427,9 +483,11 @@ class ExecutionChecker(ResultVisitor): test_result["doc"] = replace(doc_str, ' |br| [', '[', maxreplace=1) test_result["msg"] = test.message.replace('\n', ' |br| '). \ replace('\r', '').replace('"', "'") + test_result["status"] = test.status if test.status == "PASS" and ("NDRPDRDISC" in tags or "TCP" in tags or - "MRR" in tags): + "MRR" in tags or + "BMRR" in tags): if "NDRDISC" in tags: test_type = "NDR" elif "PDRDISC" in tags: @@ -438,6 +496,8 @@ class ExecutionChecker(ResultVisitor): test_type = "TCP" elif "MRR" in tags: test_type = "MRR" + elif "FRMOBL" in tags or "BMRR" in tags: + test_type = "BMRR" else: return @@ -470,17 +530,21 @@ class ExecutionChecker(ResultVisitor): test_result["result"] = dict() test_result["result"]["value"] = int(groups.group(2)) test_result["result"]["unit"] = groups.group(1) - elif test_type in ("MRR", ): - groups = re.search(self.REGEX_MRR, test.message) + + elif test_type in ("MRR", "BMRR"): test_result["result"] = dict() - test_result["result"]["duration"] = int(groups.group(1)) - test_result["result"]["tx"] = int(groups.group(2)) - test_result["result"]["rx"] = int(groups.group(3)) - test_result["result"]["throughput"] = int( - test_result["result"]["rx"] / - test_result["result"]["duration"]) - else: - test_result["status"] = test.status + groups = re.search(self.REGEX_BMRR, test.message) + if groups is not None: + items_str = groups.group(1) + items_float = [float(item.strip()) for item + in items_str.split(",")] + test_result["result"]["receive-rate"] = \ + AvgStdevMetadataFactory.from_data(items_float) + else: + groups = re.search(self.REGEX_MRR, test.message) + test_result["result"]["receive-rate"] = \ + AvgStdevMetadataFactory.from_data([ + float(groups.group(3)) / float(groups.group(1)), ]) self._test_ID = test.longname.lower() self._data["tests"][self._test_ID] = test_result @@ -557,7 +621,11 @@ class ExecutionChecker(ResultVisitor): self._lookup_kw_nr += 1 self._show_run_lookup_nr = 0 self._msg_type = "test-show-runtime" - test_kw.messages.visit(self) + elif test_kw.name.count("Start The L2fwd Test") and not self._version: + self._msg_type = "dpdk-version" + else: + return + test_kw.messages.visit(self) def end_test_kw(self, test_kw): """Called when keyword ends. Default implementation does nothing. @@ -591,8 +659,14 @@ class ExecutionChecker(ResultVisitor): """ if setup_kw.name.count("Show Vpp Version On All Duts") \ and not self._version: - self._msg_type = "setup-version" - setup_kw.messages.visit(self) + self._msg_type = "vpp-version" + + elif setup_kw.name.count("Setup performance global Variables") \ + and not self._timestamp: + self._msg_type = "timestamp" + else: + return + setup_kw.messages.visit(self) def end_setup_kw(self, setup_kw): """Called when keyword ends. Default implementation does nothing. @@ -681,12 +755,11 @@ class InputData(object): - job name - build number - metadata - - job - - build - - vpp version + (as described in ExecutionChecker documentation) - suites + (as described in ExecutionChecker documentation) - tests - - ID: test data (as described in ExecutionChecker documentation) + (as described in ExecutionChecker documentation) """ def __init__(self, spec): @@ -979,13 +1052,13 @@ class InputData(object): - job 1 - build 1 - - test (suite) 1 ID: + - test (or suite) 1 ID: - param 1 - param 2 ... - param n ... - - test (suite) n ID: + - test (or suite) n ID: ... ... - build n