CSIT-1488: Add data to the Report 1904

- HoneyComb

Change-Id: I0f7d6ef4368d347c245b8962d3ce346b73d5932a
Signed-off-by: Tibor Frank <tifrank@cisco.com>

diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py
index 238145b..dfed6b3 100644 (file)
--- a/resources/tools/presentation/pal.py
+++ b/resources/tools/presentation/pal.py
@@ -94,48 +94,48 @@ def main():
         return 1
 
     ret_code = 1
         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__':
 
 
 if __name__ == '__main__':

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 4cdddfe..83d69e2 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -407,7 +407,7 @@
     # HoneyComb Functional
     hc-func-results:
       csit-hc2vpp-verify-func-1904-ubuntu1604:
     # HoneyComb Functional
     hc-func-results:
       csit-hc2vpp-verify-func-1904-ubuntu1604:

-        - 1
+        - 4

 
 #    # NSH SFC Functional
 #    nsh-func-results:
 
 #    # NSH SFC Functional
 #    nsh-func-results:


@@ -1603,7 +1603,7 @@
     csit-dmm-functional-1904-ubuntu1604-virl:
       - 1
     csit-hc2vpp-verify-func-1904-ubuntu1604:
     csit-dmm-functional-1904-ubuntu1604-virl:
       - 1
     csit-hc2vpp-verify-func-1904-ubuntu1604:

-      - 1
+      - 4

 
 - type: "output"
   output: "report"
 
 - type: "output"
   output: "report"