X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_parser.py;h=4a72266f5f7618a57319149c174e13d87b8e19c6;hp=57ec935de1a73f43bea87a2175b78a415d45f6e8;hb=eb5271b56cb94711420a1eb7372b0f4d5f275a40;hpb=28ac3a22615e19cafa7358508a24a9bd9b287544 diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index 57ec935de1..4a72266f5f 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -65,13 +65,91 @@ class ExecutionChecker(ResultVisitor): } } "tests": { + # NDRPDR tests: "ID": { "name": "Test name", "parent": "Name of the parent of the test", - "doc": "Test documentation" - "msg": "Test message" + "doc": "Test documentation", + "msg": "Test message", + "vat-history": "DUT1 and DUT2 VAT History", + "show-run": "Show Run", + "tags": ["tag 1", "tag 2", "tag n"], + "type": "NDRPDR", + "status": "PASS" | "FAIL", + "throughput": { + "NDR": { + "LOWER": float, + "UPPER": float + }, + "PDR": { + "LOWER": float, + "UPPER": float + } + }, + "latency": { + "NDR": { + "direction1": { + "min": float, + "avg": float, + "max": float + }, + "direction2": { + "min": float, + "avg": float, + "max": float + } + }, + "PDR": { + "direction1": { + "min": float, + "avg": float, + "max": float + }, + "direction2": { + "min": float, + "avg": float, + "max": float + } + } + } + } + + # TCP tests: + "ID": { + "name": "Test name", + "parent": "Name of the parent of the test", + "doc": "Test documentation", + "msg": "Test message", "tags": ["tag 1", "tag 2", "tag n"], - "type": "PDR" | "NDR" | "TCP" | "MRR" | "BMRR", + "type": "TCP", + "status": "PASS" | "FAIL", + "result": int + } + + # MRR, BMRR tests: + "ID": { + "name": "Test name", + "parent": "Name of the parent of the test", + "doc": "Test documentation", + "msg": "Test message", + "tags": ["tag 1", "tag 2", "tag n"], + "type": "MRR" | "BMRR", + "status": "PASS" | "FAIL", + "result": { + "receive-rate": AvgStdevMetadata, + } + } + + # TODO: Remove when definitely no NDRPDRDISC tests are used: + # NDRPDRDISC tests: + "ID": { + "name": "Test name", + "parent": "Name of the parent of the test", + "doc": "Test documentation", + "msg": "Test message", + "tags": ["tag 1", "tag 2", "tag n"], + "type": "PDR" | "NDR", + "status": "PASS" | "FAIL", "throughput": { # Only type: "PDR" | "NDR" "value": int, "unit": "pps" | "bps" | "percentage" @@ -112,13 +190,6 @@ class ExecutionChecker(ResultVisitor): } } }, - "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" @@ -170,8 +241,15 @@ class ExecutionChecker(ResultVisitor): .. note:: ID is the lowercase full path to the test. """ + # TODO: Remove when definitely no NDRPDRDISC tests are used: REGEX_RATE = re.compile(r'^[\D\d]*FINAL_RATE:\s(\d+\.\d+)\s(\w+)') + REGEX_NDRPDR_RATE = re.compile(r'NDR_LOWER:\s(\d+.\d+).*\n.*\n' + r'NDR_UPPER:\s(\d+.\d+).*\n' + r'PDR_LOWER:\s(\d+.\d+).*\n.*\n' + r'PDR_UPPER:\s(\d+.\d+)') + + # TODO: Remove when definitely no NDRPDRDISC tests are used: REGEX_LAT_NDR = re.compile(r'^[\D\d]*' r'LAT_\d+%NDR:\s\[\'(-?\d+/-?\d+/-?\d+)\',' r'\s\'(-?\d+/-?\d+/-?\d+)\'\]\s\n' @@ -184,6 +262,9 @@ class ExecutionChecker(ResultVisitor): r'LAT_\d+%PDR:\s\[\'(-?\d+/-?\d+/-?\d+)\',' r'\s\'(-?\d+/-?\d+/-?\d+)\'\][\D\d]*') + REGEX_NDRPDR_LAT = re.compile(r'LATENCY.*\[\'(.*)\', \'(.*)\'\]\s\n.*\n.*\n' + r'LATENCY.*\[\'(.*)\', \'(.*)\'\]') + REGEX_TOLERANCE = re.compile(r'^[\D\d]*LOSS_ACCEPTANCE:\s(\d*\.\d*)\s' r'[\D\d]*') @@ -197,7 +278,8 @@ class ExecutionChecker(ResultVisitor): 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_BMRR = re.compile(r'Maximum Receive Rate trial results' + r' in packets per second: \[(.*)\]') REGEX_TC_TAG = re.compile(r'\d+[tT]\d+[cC]') @@ -205,6 +287,8 @@ class ExecutionChecker(ResultVisitor): REGEX_TC_NAME_NEW = re.compile(r'-\d+[cC]-') + REGEX_TC_NUMBER = re.compile(r'tc[0-9]{2}-') + def __init__(self, metadata): """Initialisation. @@ -360,6 +444,7 @@ class ExecutionChecker(ResultVisitor): except KeyError: pass + # TODO: Remove when definitely no NDRPDRDISC tests are used: def _get_latency(self, msg, test_type): """Get the latency data from the test message. @@ -406,6 +491,74 @@ class ExecutionChecker(ResultVisitor): return latency + def _get_ndrpdr_throughput(self, msg): + """Get NDR_LOWER, NDR_UPPER, PDR_LOWER and PDR_UPPER from the test + message. + + :param msg: The test message to be parsed. + :type msg: str + :returns: Parsed data as a dict and the status (PASS/FAIL). + :rtype: tuple(dict, str) + """ + + throughput = { + "NDR": {"LOWER": -1.0, "UPPER": -1.0}, + "PDR": {"LOWER": -1.0, "UPPER": -1.0} + } + status = "FAIL" + groups = re.search(self.REGEX_NDRPDR_RATE, msg) + + if groups is not None: + try: + throughput["NDR"]["LOWER"] = float(groups.group(1)) + throughput["NDR"]["UPPER"] = float(groups.group(2)) + throughput["PDR"]["LOWER"] = float(groups.group(3)) + throughput["PDR"]["UPPER"] = float(groups.group(4)) + status = "PASS" + except (IndexError, ValueError): + pass + + return throughput, status + + def _get_ndrpdr_latency(self, msg): + """Get LATENCY from the test message. + + :param msg: The test message to be parsed. + :type msg: str + :returns: Parsed data as a dict and the status (PASS/FAIL). + :rtype: tuple(dict, str) + """ + + latency = { + "NDR": { + "direction1": {"min": -1.0, "avg": -1.0, "max": -1.0}, + "direction2": {"min": -1.0, "avg": -1.0, "max": -1.0} + }, + "PDR": { + "direction1": {"min": -1.0, "avg": -1.0, "max": -1.0}, + "direction2": {"min": -1.0, "avg": -1.0, "max": -1.0} + } + } + status = "FAIL" + groups = re.search(self.REGEX_NDRPDR_LAT, msg) + + if groups is not None: + keys = ("min", "avg", "max") + try: + latency["NDR"]["direction1"] = dict( + zip(keys, [float(l) for l in groups.group(1).split('/')])) + latency["NDR"]["direction2"] = dict( + zip(keys, [float(l) for l in groups.group(2).split('/')])) + latency["PDR"]["direction1"] = dict( + zip(keys, [float(l) for l in groups.group(3).split('/')])) + latency["PDR"]["direction2"] = dict( + zip(keys, [float(l) for l in groups.group(4).split('/')])) + status = "PASS" + except (IndexError, ValueError): + pass + + return latency, status + def visit_suite(self, suite): """Implements traversing through the suite and its direct children. @@ -476,6 +629,9 @@ class ExecutionChecker(ResultVisitor): tags = [str(tag) for tag in test.tags] test_result = dict() test_result["name"] = test.name.lower() + # Remove TC number from the TC name (not needed): + test_result["name"] = re.sub(self.REGEX_TC_NUMBER, "", + test.name.lower()) test_result["parent"] = test.parent.name.lower() test_result["tags"] = tags doc_str = test.doc.replace('"', "'").replace('\n', ' '). \ @@ -483,27 +639,66 @@ 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["type"] = "FUNC" test_result["status"] = test.status + # Remove TC number from the TC long name (backward compatibility): + self._test_ID = re.sub(self.REGEX_TC_NUMBER, "", test.longname.lower()) + + if "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 + # test case names if necessary. + groups = re.search(self.REGEX_TC_NAME_OLD, self._test_ID) + if not groups: + tag_count = 0 + for tag in test_result["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, + "-{0}-".format(tag_tc.lower()), + self._test_ID, + count=1) + test_result["name"] = re.sub(self.REGEX_TC_NAME_NEW, + "-{0}-".format(tag_tc.lower()), + test_result["name"], + count=1) + else: + test_result["status"] = "FAIL" + self._data["tests"][self._test_ID] = test_result + logging.error("The test '{0}' has no or more than one " + "multi-threading tags.".format(self._test_ID)) + return + if test.status == "PASS" and ("NDRPDRDISC" in tags or + "NDRPDR" in tags or "TCP" in tags or "MRR" in tags or "BMRR" in tags): + # TODO: Remove when definitely no NDRPDRDISC tests are used: if "NDRDISC" in tags: - test_type = "NDR" + test_result["type"] = "NDR" + # TODO: Remove when definitely no NDRPDRDISC tests are used: elif "PDRDISC" in tags: - test_type = "PDR" + test_result["type"] = "PDR" + elif "NDRPDR" in tags: + test_result["type"] = "NDRPDR" elif "TCP" in tags: - test_type = "TCP" + test_result["type"] = "TCP" elif "MRR" in tags: - test_type = "MRR" + test_result["type"] = "MRR" elif "FRMOBL" in tags or "BMRR" in tags: - test_type = "BMRR" + test_result["type"] = "BMRR" else: + test_result["status"] = "FAIL" + self._data["tests"][self._test_ID] = test_result return - test_result["type"] = test_type - - if test_type in ("NDR", "PDR"): + # TODO: Remove when definitely no NDRPDRDISC tests are used: + if test_result["type"] in ("NDR", "PDR"): try: rate_value = str(re.search( self.REGEX_RATE, test.message).group(1)) @@ -520,18 +715,22 @@ class ExecutionChecker(ResultVisitor): int(rate_value.split('.')[0]) test_result["throughput"]["unit"] = rate_unit test_result["latency"] = \ - self._get_latency(test.message, test_type) - if test_type == "PDR": + self._get_latency(test.message, test_result["type"]) + if test_result["type"] == "PDR": test_result["lossTolerance"] = str(re.search( self.REGEX_TOLERANCE, test.message).group(1)) - elif test_type in ("TCP", ): + elif test_result["type"] in ("NDRPDR", ): + test_result["throughput"], test_result["status"] = \ + self._get_ndrpdr_throughput(test.message) + test_result["latency"], test_result["status"] = \ + self._get_ndrpdr_latency(test.message) + + elif test_result["type"] in ("TCP", ): groups = re.search(self.REGEX_TCP, test.message) - test_result["result"] = dict() - test_result["result"]["value"] = int(groups.group(2)) - test_result["result"]["unit"] = groups.group(1) + test_result["result"] = int(groups.group(2)) - elif test_type in ("MRR", "BMRR"): + elif test_result["type"] in ("MRR", "BMRR"): test_result["result"] = dict() groups = re.search(self.REGEX_BMRR, test.message) if groups is not None: @@ -546,7 +745,6 @@ class ExecutionChecker(ResultVisitor): 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 def end_test(self, test): @@ -1092,6 +1290,8 @@ class InputData(object): if params is None: params = element.get("parameters", None) + if params: + params.append("type") data = pd.Series() try: