-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 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:
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
: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 for_output: str
+ :type process_oper: bool
"""
# Type of message to parse out from the test messages
# Ignore list
self._ignore = ignore
- self._for_output = for_output
+ self._process_oper = process_oper
# Number of PAPI History messages found:
# 0 - no message
)
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 = (
: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"):
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(
- metadata, self._cfg.mapping, self._cfg.ignore, self._for_output
+ metadata, self._cfg.mapping, self._cfg.ignore, process_oper
)
result.visit(checker)