import multiprocessing
import os
import re
+import resource
import pandas as pd
import logging
"parent": "Name of the parent of the test",
"doc": "Test documentation",
"msg": "Test message",
- "vat-history": "DUT1 and DUT2 VAT History",
+ "conf-history": "DUT1 and DUT2 VAT History",
"show-run": "Show Run",
"tags": ["tag 1", "tag 2", "tag n"],
"type": "NDRPDR",
}
},
"lossTolerance": "lossTolerance", # Only type: "PDR"
- "vat-history": "DUT1 and DUT2 VAT History"
+ "conf-history": "DUT1 and DUT2 VAT History"
"show-run": "Show Run"
},
"ID" {
"doc": "Test documentation"
"msg": "Test message"
"tags": ["tag 1", "tag 2", "tag n"],
- "vat-history": "DUT1 and DUT2 VAT History"
+ "conf-history": "DUT1 and DUT2 VAT History"
"show-run": "Show Run"
"status": "PASS" | "FAIL"
},
# TODO: Remove when definitely no NDRPDRDISC tests are used:
REGEX_RATE = re.compile(r'^[\D\d]*FINAL_RATE:\s(\d+\.\d+)\s(\w+)')
+ REGEX_PLR_RATE = re.compile(r'PLRsearch lower bound::\s(\d+.\d+).*\n'
+ r'PLRsearch upper bound::\s(\d+.\d+)')
+
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'[\D\d]*')
REGEX_VERSION_VPP = re.compile(r"(return STDOUT Version:\s*|"
- r"VPP Version:\s*)(.*)")
+ r"VPP Version:\s*|VPP version:\s*)(.*)")
REGEX_VERSION_DPDK = re.compile(r"(return STDOUT testpmd)([\d\D\n]*)"
r"(RTE Version: 'DPDK )(.*)(')")
# 1 - VAT History of DUT1
# 2 - VAT History of DUT2
self._lookup_kw_nr = 0
- self._vat_history_lookup_nr = 0
+ self._conf_history_lookup_nr = 0
# Number of Show Running messages found
# 0 - no message
"vpp-version": self._get_vpp_version,
"dpdk-version": self._get_dpdk_version,
"teardown-vat-history": self._get_vat_history,
+ "teardown-papi-history": self._get_papi_history,
"test-show-runtime": self._get_show_run,
"testbed": self._get_testbed
}
"""
if msg.message.count("return STDOUT Version:") or \
- msg.message.count("VPP Version:"):
+ msg.message.count("VPP Version:") or \
+ msg.message.count("VPP version:"):
self._version = str(re.search(self.REGEX_VERSION_VPP, msg.message).
group(2))
self._data["metadata"]["version"] = self._version
:returns: Nothing.
"""
if msg.message.count("VAT command history:"):
- self._vat_history_lookup_nr += 1
- if self._vat_history_lookup_nr == 1:
- self._data["tests"][self._test_ID]["vat-history"] = str()
+ self._conf_history_lookup_nr += 1
+ if self._conf_history_lookup_nr == 1:
+ self._data["tests"][self._test_ID]["conf-history"] = str()
else:
self._msg_type = None
text = re.sub("[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3} "
replace("\n\n", "\n").replace('\n', ' |br| ').\
replace('\r', '').replace('"', "'")
- self._data["tests"][self._test_ID]["vat-history"] += " |br| "
- self._data["tests"][self._test_ID]["vat-history"] += \
- "**DUT" + str(self._vat_history_lookup_nr) + ":** " + text
+ self._data["tests"][self._test_ID]["conf-history"] += " |br| "
+ self._data["tests"][self._test_ID]["conf-history"] += \
+ "**DUT" + str(self._conf_history_lookup_nr) + ":** " + text
+
+ def _get_papi_history(self, msg):
+ """Called when extraction of PAPI command history is required.
+
+ :param msg: Message to process.
+ :type msg: Message
+ :returns: Nothing.
+ """
+ if msg.message.count("PAPI command history:"):
+ self._conf_history_lookup_nr += 1
+ if self._conf_history_lookup_nr == 1:
+ self._data["tests"][self._test_ID]["conf-history"] = str()
+ else:
+ self._msg_type = None
+ text = re.sub("[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3} "
+ "PAPI command history:", "", msg.message, count=1). \
+ replace("\n\n", "\n").replace('\n', ' |br| ').\
+ replace('\r', '').replace('"', "'")
+
+ self._data["tests"][self._test_ID]["conf-history"] += " |br| "
+ self._data["tests"][self._test_ID]["conf-history"] += \
+ "**DUT" + str(self._conf_history_lookup_nr) + ":** " + text
def _get_show_run(self, msg):
"""Called when extraction of VPP operational data (output of CLI command
:type msg: Message
:returns: Nothing.
"""
- if msg.message.count("return STDOUT Thread "):
+ if msg.message.count("Thread 0 vpp_main"):
self._show_run_lookup_nr += 1
if self._lookup_kw_nr == 1 and self._show_run_lookup_nr == 1:
self._data["tests"][self._test_ID]["show-run"] = str()
return throughput, status
+ def _get_plr_throughput(self, msg):
+ """Get PLRsearch lower bound and PLRsearch upper bound 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 = {
+ "LOWER": -1.0,
+ "UPPER": -1.0
+ }
+ status = "FAIL"
+ groups = re.search(self.REGEX_PLR_RATE, msg)
+
+ if groups is not None:
+ try:
+ throughput["LOWER"] = float(groups.group(1))
+ throughput["UPPER"] = float(groups.group(2))
+ status = "PASS"
+ except (IndexError, ValueError):
+ pass
+
+ return throughput, status
+
def _get_ndrpdr_latency(self, msg):
"""Get LATENCY from the test message.
if test.status == "PASS" and ("NDRPDRDISC" in tags or
"NDRPDR" in tags or
+ "SOAK" in tags or
"TCP" in tags or
"MRR" in tags or
"BMRR" in tags):
test_result["type"] = "PDR"
elif "NDRPDR" in tags:
test_result["type"] = "NDRPDR"
+ elif "SOAK" in tags:
+ test_result["type"] = "SOAK"
elif "TCP" in tags:
test_result["type"] = "TCP"
elif "MRR" in tags:
test_result["latency"], test_result["status"] = \
self._get_ndrpdr_latency(test.message)
+ elif test_result["type"] in ("SOAK", ):
+ test_result["throughput"], test_result["status"] = \
+ self._get_plr_throughput(test.message)
+
elif test_result["type"] in ("TCP", ):
groups = re.search(self.REGEX_TCP, test.message)
test_result["result"] = int(groups.group(2))
if setup_kw.name.count("Show Vpp Version On All Duts") \
and not self._version:
self._msg_type = "vpp-version"
-
- elif setup_kw.name.count("Setup performance global Variables") \
+ elif setup_kw.name.count("Set Global Variable") \
and not self._timestamp:
self._msg_type = "timestamp"
elif setup_kw.name.count("Setup Framework") and not self._testbed:
"""
if teardown_kw.name.count("Show Vat History On All Duts"):
- self._vat_history_lookup_nr = 0
+ self._conf_history_lookup_nr = 0
self._msg_type = "teardown-vat-history"
teardown_kw.messages.visit(self)
+ elif teardown_kw.name.count("Show Papi History On All Duts"):
+ self._conf_history_lookup_nr = 0
+ self._msg_type = "teardown-papi-history"
+ teardown_kw.messages.visit(self)
def end_teardown_kw(self, teardown_kw):
"""Called when keyword ends. Default implementation does nothing.
logs = list()
- logging.info(" Processing the job/build: {0}: {1}".
- format(job, build["build"]))
-
logs.append(("INFO", " Processing the job/build: {0}: {1}".
format(job, build["build"])))
"'{build}', or it is damaged. Skipped.".
format(job=job, build=build["build"])))
if success:
- logs.append(("INFO", " Processing data from the build '{0}' ...".
+ logs.append(("INFO", " Processing data from the build '{0}' ...".
format(build["build"])))
data = self._parse_tests(job, build, logs)
if data is None:
file_name = self._cfg.input["file-name"]
full_name = join(
self._cfg.environment["paths"]["DIR[WORKING,DATA]"],
- "{job}{sep}{build}{sep}{name}".
- format(job=job,
- sep=SEPARATOR,
- build=build["build"],
- name=file_name))
+ "{job}{sep}{build}{sep}{name}".format(
+ job=job,
+ sep=SEPARATOR,
+ build=build["build"],
+ name=file_name))
try:
remove(full_name)
logs.append(("INFO",
format(name=full_name)))
except OSError as err:
logs.append(("ERROR",
- "Cannot remove the file '{0}': {1}".
- format(full_name, repr(err))))
-
+ "Cannot remove the file '{0}': {1}".
+ format(full_name, repr(err))))
logs.append(("INFO", " Done."))
result = {
"data": data,
"state": state,
"job": job,
- "build": build,
- "logs": logs
+ "build": build
}
data_queue.put(result)
+ for level, line in logs:
+ if level == "INFO":
+ logging.info(line)
+ elif level == "ERROR":
+ logging.error(line)
+ elif level == "DEBUG":
+ logging.debug(line)
+ elif level == "CRITICAL":
+ logging.critical(line)
+ elif level == "WARNING":
+ logging.warning(line)
+
+ logging.info("Memory allocation: {0:,d}MB".format(
+ resource.getrusage(resource.RUSAGE_SELF).ru_maxrss / 1000))
+
def download_and_parse_data(self, repeat=1):
"""Download the input data files, parse input data from input files and
store in pandas' Series.
work_queue.join()
logging.info("Done.")
+ logging.info("Collecting data:")
while not data_queue.empty():
result = data_queue.get()
job = result["job"]
build_nr = result["build"]["build"]
+ logging.info(" {job}-{build}".format(job=job, build=build_nr))
if result["data"]:
data = result["data"]
build_data = pd.Series({
- "metadata": pd.Series(data["metadata"].values(),
- index=data["metadata"].keys()),
+ "metadata": pd.Series(
+ data["metadata"].values(),
+ index=data["metadata"].keys()),
"suites": pd.Series(data["suites"].values(),
index=data["suites"].keys()),
"tests": pd.Series(data["tests"].values(),
self._input_data[job] = pd.Series()
self._input_data[job][str(build_nr)] = build_data
- self._cfg.set_input_file_name(job, build_nr,
- result["build"]["file-name"])
+ self._cfg.set_input_file_name(
+ job, build_nr, result["build"]["file-name"])
self._cfg.set_input_state(job, build_nr, result["state"])
- for item in result["logs"]:
- if item[0] == "INFO":
- logging.info(item[1])
- elif item[0] == "ERROR":
- logging.error(item[1])
- elif item[0] == "DEBUG":
- logging.debug(item[1])
- elif item[0] == "CRITICAL":
- logging.critical(item[1])
- elif item[0] == "WARNING":
- logging.warning(item[1])
+ logging.info("Memory allocation: {0:,d}MB".format(
+ resource.getrusage(resource.RUSAGE_SELF).ru_maxrss / 1000))
del data_queue
Code Review / csit.git / blobdiff