X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fpal.py;h=238145b70ff17d63e10dbe1aec4b8bf755cf10b4;hp=aaeacaac15cca7b1cc28da5776e1662de127d346;hb=db2fcb13bab0085abaaa704e87e345d43734ac86;hpb=f2f19bad6847e315366e5e9ab4952fded0097b1f

diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py
index aaeacaac15..238145b70f 100644
--- a/resources/tools/presentation/pal.py
+++ b/resources/tools/presentation/pal.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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,7 +21,6 @@ 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
@@ -29,8 +28,7 @@ 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
+from generator_alerts import Alerting, AlertingError
 
 
 def parse_args():
@@ -51,6 +49,10 @@ def parse_args():
                         default="master",
                         type=str,
                         help="Release string of the product.")
+    parser.add_argument("-w", "--week",
+                        default="1",
+                        type=str,
+                        help="Calendar week when the report is published.")
     parser.add_argument("-l", "--logging",
                         choices=["DEBUG", "INFO", "WARNING",
                                  "ERROR", "CRITICAL"],
@@ -86,47 +88,52 @@ def main():
         logging.critical("Finished with error.")
         return 1
 
-    ret_code = 0
+    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=1)
 
     generate_tables(spec, data)
     generate_plots(spec, data)
     generate_files(spec, data)
 
     if spec.output["output"] == "report":
-        generate_report(args.release, spec)
+        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.")
-    else:
-        logging.critical("The output '{0}' is not supported.".
-                         format(spec.output["output"]))
-        ret_code = 1
+    ret_code = 0
 
-    # except (KeyError, ValueError, PresentationError) as err:
-    #     logging.info("Finished with an error.")
-    #     logging.critical(str(err))
-    #     ret_code = 1
+    # 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))
-    #     ret_code = 1
+    #     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)
     #     return ret_code