Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Report: Add release data
[csit.git]
/
resources
/
tools
/
presentation
/
input_data_parser.py
diff --git
a/resources/tools/presentation/input_data_parser.py
b/resources/tools/presentation/input_data_parser.py
index
461d7b4
..
64aab49
100644
(file)
--- a/
resources/tools/presentation/input_data_parser.py
+++ b/
resources/tools/presentation/input_data_parser.py
@@
-1,4
+1,4
@@
-# Copyright (c) 202
1
Cisco and/or its affiliates.
+# Copyright (c) 202
2
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:
# 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:
@@
-297,7
+297,7
@@
class ExecutionChecker(ResultVisitor):
r'hostname=\"(\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3})\",hook=\"(.*)\"'
)
r'hostname=\"(\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3})\",hook=\"(.*)\"'
)
- def __init__(self, metadata, mapping, ignore,
for_output
):
+ def __init__(self, metadata, mapping, ignore,
process_oper
):
"""Initialisation.
:param metadata: Key-value pairs to be included in "metadata" part of
"""Initialisation.
:param metadata: Key-value pairs to be included in "metadata" part of
@@
-305,11
+305,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 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 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
"""
# Type of message to parse out from the test messages
@@
-330,7
+331,7
@@
class ExecutionChecker(ResultVisitor):
# Ignore list
self._ignore = ignore
# Ignore list
self._ignore = ignore
- self._
for_output = for_output
+ self._
process_oper = process_oper
# Number of PAPI History messages found:
# 0 - no message
# Number of PAPI History messages found:
# 0 - no message
@@
-518,17
+519,15
@@
class ExecutionChecker(ResultVisitor):
)
if all(hdr_lat):
return hdr_lat
)
if all(hdr_lat):
return hdr_lat
- else:
- hdr_lat = (
- in_list_1[0], in_list_1[1], in_list_1[2],
- in_list_2[0], in_list_2[1], in_list_2[2]
- )
- for item in hdr_lat:
- if item in (u"-1", u"4294967295", u"0"):
- return None
- 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 = (
try:
out_msg = (
@@
-1203,15
+1202,15
@@
class ExecutionChecker(ResultVisitor):
if test.status == u"PASS":
test_result[u"throughput"], test_result[u"status"] = \
self._get_plr_throughput(test.message)
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"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":
# elif u"TCP" in tags: # This might be not used
# test_result[u"type"] = u"TCP"
# if test.status == u"PASS":
@@
-1299,7
+1298,7
@@
class ExecutionChecker(ResultVisitor):
:type test_kw: Keyword
:returns: Nothing.
"""
:type test_kw: Keyword
:returns: Nothing.
"""
- if
self._for_output == u"trending"
:
+ if
not self._process_oper
:
return
if test_kw.name.count(u"Run Telemetry On All Duts"):
return
if test_kw.name.count(u"Run Telemetry On All Duts"):
@@
-1528,8
+1527,18
@@
class InputData:
f"Error occurred while parsing output.xml: {repr(err)}"
)
return None
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(
checker = ExecutionChecker(
- metadata, self._cfg.mapping, self._cfg.ignore,
self._for_output
+ metadata, self._cfg.mapping, self._cfg.ignore,
process_oper
)
result.visit(checker)
)
result.visit(checker)