X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fpal.py;h=211f24d4d8519b831517ec262f71956c3d2cadd6;hp=4c5de010d429ffe0e6e810c26084946629bcb01a;hb=77175cdd458e9c9fa9020d73d2f0f0c9b6e7eeb6;hpb=6addc914c636a0dbc1e12a661019cce1715baf77

diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py
index 4c5de010d4..211f24d4d8 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:
@@ -21,13 +21,14 @@ import logging
 from errors import PresentationError
 from environment import Environment, clean_environment
 from specification_parser import Specification
-from input_data_files import download_data_files, unzip_files
 from input_data_parser import InputData
 from generator_tables import generate_tables
 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 generator_alerts import Alerting, AlertingError
 
 
 def parse_args():
@@ -48,6 +49,10 @@ def parse_args():
                         default="master",
                         type=str,
                         help="Release string of the product.")
+    parser.add_argument("-v", "--version",
+                        default="0.1",
+                        type=str,
+                        help="Version of the product.")
     parser.add_argument("-l", "--logging",
                         choices=["DEBUG", "INFO", "WARNING",
                                  "ERROR", "CRITICAL"],
@@ -81,42 +86,54 @@ def main():
         spec.read_specification()
     except PresentationError:
         logging.critical("Finished with error.")
-        sys.exit(1)
+        return 1
+
+    if spec.output["output"] not in ("report", "CPTA"):
+        logging.critical("The output '{0}' is not supported.".
+                         format(spec.output["output"]))
+        return 1
 
+    ret_code = 1
     # try:
     env = Environment(spec.environment, args.force)
     env.set_environment()
 
-    if spec.is_debug:
-        if spec.debug["input-format"] == "zip":
-            unzip_files(spec)
-    else:
-        download_data_files(spec)
-
     prepare_static_content(spec)
 
     data = InputData(spec)
-    data.read_data()
+    data.download_and_parse_data(repeat=2)
 
     generate_tables(spec, data)
     generate_plots(spec, data)
     generate_files(spec, data)
-    generate_report(args.release, spec)
-
-    logging.info("Successfully finished.")
 
-    # except (KeyError, ValueError, PresentationError) as err:
-    #     logging.info("Finished with an error.")
-    #     logging.critical(str(err))
+    if spec.output["output"] == "report":
+        generate_report(args.release, spec, args.version)
+        logging.info("Successfully finished.")
+    elif spec.output["output"] == "CPTA":
+        sys.stdout.write(generate_cpta(spec, data))
+        alert = Alerting(spec)
+        alert.generate_alerts()
+        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.info("Finished with an unexpected error.")
-    #     logging.critical(str(err))
-    #
+    #     logging.critical("Finished with an unexpected error.")
+    #     logging.critical(repr(err))
     # finally:
-    #     if spec is not None and not spec.is_debug:
+    #     if spec is not None:
     #         clean_environment(spec.environment)
-    #     sys.exit(1)
+    #     return ret_code
 
 
 if __name__ == '__main__':
-    main()
+    sys.exit(main())