aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2019-05-14 10:04:41 +0200
committerTibor Frank <tifrank@cisco.com>2019-05-14 08:06:07 +0000
commit8c7450e86ee069d0be91787a2b4a87e246021981 (patch)
tree6e27503f32dc0569dd5b3f5e83d1867ff34a1c83 /resources
parent23170c852335360df3a731d8f498888da821c70b (diff)
CSIT-1500: Add comparison table for SOAK vs NDRPDR
- clean-up Change-Id: I020837a89415fdb891ffbb094c9a5edf50946dd2 Signed-off-by: Tibor Frank <tifrank@cisco.com> (cherry picked from commit 6f0d055b4bd4a6cbd4d60d9f4ce422c996ebd153)
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/presentation/pal.py84
-rw-r--r--resources/tools/presentation/specification.yaml33
2 files changed, 44 insertions, 73 deletions
diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py
index 238145b70f..dfed6b3e62 100644
--- a/resources/tools/presentation/pal.py
+++ b/resources/tools/presentation/pal.py
@@ -94,48 +94,48 @@ def main():
return 1
ret_code = 1
- # try:
- env = Environment(spec.environment, args.force)
- env.set_environment()
-
- prepare_static_content(spec)
-
- data = InputData(spec)
- data.download_and_parse_data(repeat=1)
-
- generate_tables(spec, data)
- generate_plots(spec, data)
- generate_files(spec, data)
-
- if spec.output["output"] == "report":
- generate_report(args.release, spec, args.week)
- logging.info("Successfully finished.")
- elif spec.output["output"] == "CPTA":
- sys.stdout.write(generate_cpta(spec, data))
- try:
- alert = Alerting(spec)
- alert.generate_alerts()
- except AlertingError as err:
- logging.warning(repr(err))
- logging.info("Successfully finished.")
- ret_code = 0
-
- # except AlertingError as err:
- # logging.critical("Finished with an alerting error.")
- # logging.critical(repr(err))
- # except PresentationError as err:
- # logging.critical("Finished with an PAL error.")
- # logging.critical(repr(err))
- # except (KeyError, ValueError) as err:
- # logging.critical("Finished with an error.")
- # logging.critical(repr(err))
- # except Exception as err:
- # logging.critical("Finished with an unexpected error.")
- # logging.critical(repr(err))
- # finally:
- # if spec is not None:
- # clean_environment(spec.environment)
- # return ret_code
+ try:
+ env = Environment(spec.environment, args.force)
+ env.set_environment()
+
+ prepare_static_content(spec)
+
+ data = InputData(spec)
+ data.download_and_parse_data(repeat=1)
+
+ generate_tables(spec, data)
+ generate_plots(spec, data)
+ generate_files(spec, data)
+
+ if spec.output["output"] == "report":
+ generate_report(args.release, spec, args.week)
+ logging.info("Successfully finished.")
+ elif spec.output["output"] == "CPTA":
+ sys.stdout.write(generate_cpta(spec, data))
+ try:
+ alert = Alerting(spec)
+ alert.generate_alerts()
+ except AlertingError as err:
+ logging.warning(repr(err))
+ logging.info("Successfully finished.")
+ ret_code = 0
+
+ except AlertingError as err:
+ logging.critical("Finished with an alerting error.")
+ logging.critical(repr(err))
+ except PresentationError as err:
+ logging.critical("Finished with an PAL error.")
+ logging.critical(repr(err))
+ except (KeyError, ValueError) as err:
+ logging.critical("Finished with an error.")
+ logging.critical(repr(err))
+ except Exception as err:
+ logging.critical("Finished with an unexpected error.")
+ logging.critical(repr(err))
+ finally:
+ if spec is not None:
+ clean_environment(spec.environment)
+ return ret_code
if __name__ == '__main__':
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 9346cf4b6f..7afcc19b57 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -1669,43 +1669,14 @@
title: "SOAK"
data: "vpp-soak-vs-ndr-2n-skx-cmp"
data: "vpp-soak-vs-ndr-2n-skx"
- include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+ include-tests: "NDR"
filter: "('NDRPDR' or 'SOAK')"
parameters:
- "throughput"
- "name"
- "parent"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+################################################################################
# VPP Compare NICs 3n-hsw 1t1c ndr
- type: "table"