From efdcf6470f6e15dcc918c70e5a61d10e10653f1e Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Thu, 1 Mar 2018 14:52:47 +0100 Subject: CSIT-913: Continuous Trending, Analysis and Change Detection - CSIT-915: LLD - CSIT-917: Functions to evaluate the results according to the PASS / FAIL criteria - CSIT-918: Sphinx configuration - CSIT-948: Statistical functions - CSIT-949: Data models for trending plots - CSIT-950: Code trending plots - CSIT-951: Static content - CSIT-984: PAL Specification file - CSIT-996: Download data from nexus Change-Id: Icb9305945bb0f142135bb177cb8781ba0096280e Signed-off-by: Tibor Frank --- resources/tools/presentation/pal.py | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'resources/tools/presentation/pal.py') diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py index 6d613e339c..85b7bbc370 100644 --- a/resources/tools/presentation/pal.py +++ b/resources/tools/presentation/pal.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2018 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: @@ -28,6 +28,9 @@ from generator_plots import generate_plots from generator_files import generate_files from static_content import prepare_static_content from generator_report import generate_report +from generator_CPTA import generate_cpta + +from pprint import pprint def parse_args(): @@ -81,8 +84,9 @@ def main(): spec.read_specification() except PresentationError: logging.critical("Finished with error.") - sys.exit(1) + return 1 + ret_code = 1 try: env = Environment(spec.environment, args.force) env.set_environment() @@ -101,22 +105,32 @@ def main(): generate_tables(spec, data) generate_plots(spec, data) generate_files(spec, data) - generate_report(args.release, spec) - logging.info("Successfully finished.") + if spec.output["output"] == "report": + generate_report(args.release, spec) + logging.info("Successfully finished.") + ret_code = 0 + elif spec.output["output"] == "CPTA": + ret_code = generate_cpta(spec, data) + logging.info("Successfully finished.") + else: + logging.critical("The output '{0}' is not supported.". + format(spec.output["output"])) + ret_code = 1 except (KeyError, ValueError, PresentationError) as err: logging.info("Finished with an error.") logging.critical(str(err)) + ret_code = 1 except Exception as err: logging.info("Finished with an unexpected error.") logging.critical(str(err)) - + ret_code = 1 finally: if spec is not None and not spec.is_debug: clean_environment(spec.environment) - sys.exit(1) + return ret_code if __name__ == '__main__': - main() + sys.exit(main()) -- cgit 1.2.3-korg