From 55f514061b2da3dd71e13e0a0c5a89797a2773ec Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Wed, 21 Feb 2018 09:48:39 +0100
Subject: [PATCH] CSIT-891: Add data sources for 1801 report

Change-Id: Id178e852e4c94b1e093d72901689a7f7820c2c3d
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 resources/tools/presentation/pal.py             | 66 ++++++++++++-------------
 resources/tools/presentation/specification.yaml |  6 +--
 2 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py
index 4c5de010d4..6d613e339c 100644
--- a/resources/tools/presentation/pal.py
+++ b/resources/tools/presentation/pal.py
@@ -83,39 +83,39 @@ def main():
         logging.critical("Finished with error.")
         sys.exit(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()
-
-    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))
-    # except Exception as err:
-    #     logging.info("Finished with an unexpected error.")
-    #     logging.critical(str(err))
-    #
-    # finally:
-    #     if spec is not None and not spec.is_debug:
-    #         clean_environment(spec.environment)
-    #     sys.exit(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()
+
+        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))
+    except Exception as err:
+        logging.info("Finished with an unexpected error.")
+        logging.critical(str(err))
+
+    finally:
+        if spec is not None and not spec.is_debug:
+            clean_environment(spec.environment)
+        sys.exit(1)
 
 
 if __name__ == '__main__':
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 271a5e2a25..6a18ce5436 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -100,6 +100,7 @@
       - 164
       - 165
       - 166
+      - 168
       - 169
       - 170
 # TODO: Add the data sources
@@ -147,7 +148,6 @@
       - 162  # sel
       - 163  # sel
 #      - 167  # sel
-#      - 168  # sel
 # TODO: Add the data sources
     plot-throughput-speedup-analysis:
       csit-vpp-perf-1801-all:
@@ -162,7 +162,6 @@
       - 162  # sel
       - 163  # sel
 #      - 167  # sel
-#      - 168  # sel
 #    performance-improvements:
 #      csit-vpp-perf-1707-all:
 #      - 9
@@ -248,7 +247,6 @@
       - 162  # sel
       - 163  # sel
 #      - 167  # sel
-#      - 168  # sel
     plot-dpdk-throughput-latency:
       csit-dpdk-perf-1801-all:
       - 1
@@ -570,7 +568,7 @@
     - 165  # wrk
     - 166  # wrk
 #    - 167  # sel
-#    - 168  # sel
+    - 168  # wrk
     - 169  # wrk
     - 170  # wrk
     csit-ligato-perf-1710-all:
-- 
2.16.6