aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2023-01-25 07:05:15 +0100
committerTibor Frank <tifrank@cisco.com>2023-01-25 07:05:15 +0100
commit08add4b7d39a752dafc69bf9a19caf28906fb29b (patch)
treeba638a92a9b7682c8ef389c58dfa1154a9313304
parent28f8695692aaafb8b228ae1147e4b9d82a0d9d77 (diff)
Report: Add rc1 data
Signed-off-by: Tibor Frank <tifrank@cisco.com> Change-Id: I7a79422b70aee1ac05f4b8a7257ff2fa5946e5f3
-rw-r--r--resources/tools/presentation/input_data_parser.py16
-rw-r--r--resources/tools/presentation/specifications/report/data_sets.yaml44
2 files changed, 30 insertions, 30 deletions
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 6bb15d7c93..01dbfa7d56 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -89,10 +89,10 @@ class ExecutionChecker(ResultVisitor):
REGEX_VSAP_MSG_INFO = re.compile(
r'Transfer Rate: (\d*.\d*).*\n'
r'Latency: (\d*.\d*).*\n'
- r'Completed requests: (\d*).*\n'
- r'Failed requests: (\d*).*\n'
+ r'Connection [c|r]ps rate: (\d*).*\n'
r'Total data transferred: (\d*).*\n'
- r'Connection [cr]ps rate:\s*(\d*.\d*)'
+ r'Completed requests: (\d*).*\n'
+ r'Failed requests:\s*(\d*.\d*)/gm'
)
# Needed for CPS and PPS tests
@@ -822,13 +822,13 @@ class ExecutionChecker(ResultVisitor):
try:
result["transfer-rate"] = float(groups.group(1)) * 1e3
result["latency"] = float(groups.group(2))
- result["completed-requests"] = int(groups.group(3))
- result["failed-requests"] = int(groups.group(4))
- result["bytes-transferred"] = int(groups.group(5))
+ result["completed-requests"] = int(groups.group(5))
+ result["failed-requests"] = int(groups.group(6))
+ result["bytes-transferred"] = int(groups.group(4))
if "TCP_CPS"in tags:
- result["cps"] = float(groups.group(6))
+ result["cps"] = float(groups.group(3))
elif "TCP_RPS" in tags:
- result["rps"] = float(groups.group(6))
+ result["rps"] = float(groups.group(3))
else:
return result, status
status = "PASS"
diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index 42cc56fb2e..96f84b8123 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -205,11 +205,11 @@
- 2 # 2302 NDRPDR iter env 11
- 3 # 2302 NDRPDR iter env 11
- 4 # 2302 NDRPDR iter env 11
- # - 5 # 2302 NDRPDR iter env 11
- # - 6 # 2302 NDRPDR iter env 11
+ - 5 # 2302 NDRPDR iter env 11
+ - 6 # 2302 NDRPDR iter env 11
# - 7 # 2302 NDRPDR iter env 11
- # - 8 # 2302 NDRPDR iter env 11
- # - 9 # 2302 NDRPDR iter env 11
+ - 8 # 2302 NDRPDR iter env 11
+ - 9 # 2302 NDRPDR iter env 11
# - 10 # 2302 NDRPDR iter env 11
dpdk-2n-zn2-curr-iter-best:
@@ -455,11 +455,11 @@
- 3 # 2302 NDRPDR iter env 11
- 4 # 2302 NDRPDR iter env 11
- 5 # 2302 NDRPDR iter env 11
- # - 6 # 2302 NDRPDR iter env 11
- # - 7 # 2302 NDRPDR iter env 11
- # - 8 # 2302 NDRPDR iter env 11
- # - 9 # 2302 NDRPDR iter env 11
- # - 10 # 2302 NDRPDR iter env 11
+ - 6 # 2302 NDRPDR iter env 11
+ - 7 # 2302 NDRPDR iter env 11
+ - 8 # 2302 NDRPDR iter env 11
+ - 9 # 2302 NDRPDR iter env 11
+ - 10 # 2302 NDRPDR iter env 11
dpdk-3n-tsh-curr-iter-best:
csit-dpdk-perf-report-iterative-2302-3n-tsh:
@@ -557,14 +557,14 @@
dpdk-2n-tx2-curr-iter:
csit-dpdk-perf-report-iterative-2302-2n-tx2:
- 1 # 2302 NDRPDR iter env 11
- # - 2 # 2302 NDRPDR iter env 11
+ - 2 # 2302 NDRPDR iter env 11
- 3 # 2302 NDRPDR iter env 11
- 4 # 2302 NDRPDR iter env 11
- 5 # 2302 NDRPDR iter env 11
- # - 6 # 2302 NDRPDR iter env 11
- # - 7 # 2302 NDRPDR iter env 11
+ - 6 # 2302 NDRPDR iter env 11
+ - 7 # 2302 NDRPDR iter env 11
# - 8 # 2302 NDRPDR iter env 11
- # - 9 # 2302 NDRPDR iter env 11
+ - 9 # 2302 NDRPDR iter env 11
# - 10 # 2302 NDRPDR iter env 11
dpdk-2n-tx2-curr-iter-best:
@@ -1004,16 +1004,16 @@
dpdk-3n-alt-curr-iter:
csit-dpdk-perf-report-iterative-2302-3n-alt:
- # - 1 # 2302 NDRPDR iter env 11
+ - 1 # 2302 NDRPDR iter env 11
- 2 # 2302 NDRPDR iter env 11
- 3 # 2302 NDRPDR iter env 11
- # - 4 # 2302 NDRPDR iter env 11
+ - 4 # 2302 NDRPDR iter env 11
- 5 # 2302 NDRPDR iter env 11
- # - 6 # 2302 NDRPDR iter env 11
+ - 6 # 2302 NDRPDR iter env 11
- 7 # 2302 NDRPDR iter env 11
- # - 8 # 2302 NDRPDR iter env 11
- # - 9 # 2302 NDRPDR iter env 11
- # - 10 # 2302 NDRPDR iter env 11
+ - 8 # 2302 NDRPDR iter env 11
+ - 9 # 2302 NDRPDR iter env 11
+ - 10 # 2302 NDRPDR iter env 11
dpdk-3n-alt-curr-iter-best:
csit-dpdk-perf-report-iterative-2302-3n-alt:
@@ -1101,14 +1101,14 @@
dpdk-3n-snr-curr-iter:
csit-dpdk-perf-report-iterative-2302-3n-snr:
- 1 # 2302 NDRPDR iter env 11
- # - 2 # 2302 NDRPDR iter env 11
+ - 2 # 2302 NDRPDR iter env 11
- 3 # 2302 NDRPDR iter env 11
- 4 # 2302 NDRPDR iter env 11
- # - 5 # 2302 NDRPDR iter env 11
+ - 5 # 2302 NDRPDR iter env 11
- 6 # 2302 NDRPDR iter env 11
- 7 # 2302 NDRPDR iter env 11
- 8 # 2302 NDRPDR iter env 11
- # - 9 # 2302 NDRPDR iter env 11
+ - 9 # 2302 NDRPDR iter env 11
- 10 # 2302 NDRPDR iter env 11
dpdk-3n-snr-curr-iter-best: