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

diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py
index 72493cb0d3..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:
@@ -49,10 +49,10 @@ def parse_args():
                         default="master",
                         type=str,
                         help="Release string of the product.")
-    parser.add_argument("-v", "--version",
-                        default="0.1",
+    parser.add_argument("-w", "--week",
+                        default="1",
                         type=str,
-                        help="Version of the product.")
+                        help="Calendar week when the report is published.")
     parser.add_argument("-l", "--logging",
                         choices=["DEBUG", "INFO", "WARNING",
                                  "ERROR", "CRITICAL"],
@@ -94,45 +94,48 @@ def main():
         return 1
 
     ret_code = 1
-    try:
-        env = Environment(spec.environment, args.force)
-        env.set_environment()
+    # try:
+    env = Environment(spec.environment, args.force)
+    env.set_environment()
 
-        prepare_static_content(spec)
+    prepare_static_content(spec)
 
-        data = InputData(spec)
-        data.download_and_parse_data(repeat=2)
+    data = InputData(spec)
+    data.download_and_parse_data(repeat=1)
 
-        generate_tables(spec, data)
-        generate_plots(spec, data)
-        generate_files(spec, data)
+    generate_tables(spec, data)
+    generate_plots(spec, data)
+    generate_files(spec, data)
 
-        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))
+    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()
-            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
+        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__':