Merge "Adapt push_logs after CI refactoring"

[releng.git] / utils / test / result_collection_api / dashboard / functest2Dashboard.py

diff --git a/utils/test/result_collection_api/dashboard/functest2Dashboard.py b/utils/test/result_collection_api/dashboard/functest2Dashboard.py
index a2ed308..86521b9 100644 (file)
--- a/utils/test/result_collection_api/dashboard/functest2Dashboard.py
+++ b/utils/test/result_collection_api/dashboard/functest2Dashboard.py
@@ -89,7 +89,7 @@ def format_vIMS_for_dashboard(results):
     new_element = []
 
     for data in results:
-        new_element.append({'x': data['creation_date'],
+        new_element.append({'x': data['start_date'],
                             'y1': data['details']['orchestrator']['duration'],
                             'y2': data['details']['vIMS']['duration'],
                             'y3': data['details']['sig_test']['duration']})
@@ -117,14 +117,17 @@ def format_vIMS_for_dashboard(results):
             # Calculate nb of tests run and nb of tests failed
             # vIMS_results = get_vIMSresults(vIMS_test)
             # print vIMS_results
-            if data_test['result'] == "Passed":
-                nbTests += 1
-            elif data_test['result'] == "Failed":
-                nbFailures += 1
-            elif data_test['result'] == "Skipped":
-                nbSkipped += 1
-
-        new_element.append({'x': data['creation_date'],
+            try:
+                if data_test['result'] == "Passed":
+                    nbTests += 1
+                elif data_test['result'] == "Failed":
+                    nbFailures += 1
+                elif data_test['result'] == "Skipped":
+                    nbSkipped += 1
+            except:
+                nbTests = 0
+
+        new_element.append({'x': data['start_date'],
                             'y1': nbTests,
                             'y2': nbFailures,
                             'y3': nbSkipped})
@@ -149,10 +152,13 @@ def format_vIMS_for_dashboard(results):
             nbTestsOK = 0
             nbTestsKO = 0
 
-            if data_test['result'] == "Passed":
-                nbTestsOK += 1
-            elif data_test['result'] == "Failed":
-                nbTestsKO += 1
+            try:
+                if data_test['result'] == "Passed":
+                    nbTestsOK += 1
+                elif data_test['result'] == "Failed":
+                    nbTestsKO += 1
+            except:
+                nbTestsOK = 0
 
             nbTests += nbTestsOK + nbTestsKO
             nbFailures += nbTestsKO
@@ -175,7 +181,7 @@ def format_Tempest_for_dashboard(results):
     # ********************************
     new_element = []
     for data in results:
-        new_element.append({'x': data['creation_date'],
+        new_element.append({'x': data['start_date'],
                             'y': data['details']['duration']})
 
     test_data.append({'name': "Tempest duration",
@@ -188,7 +194,7 @@ def format_Tempest_for_dashboard(results):
     # ***************************************
     new_element = []
     for data in results:
-        new_element.append({'x': data['creation_date'],
+        new_element.append({'x': data['start_date'],
                             'y1': data['details']['tests'],
                             'y2': data['details']['failures']})
 
@@ -223,7 +229,7 @@ def format_Tempest_for_dashboard(results):
         except:
             success_rate = 0
 
-        new_element.append({'x': data['creation_date'],
+        new_element.append({'x': data['start_date'],
                             'y1': success_rate})
 
     test_data.append({'name': "Tempest success rate",
@@ -251,7 +257,7 @@ def format_ODL_for_dashboard(results):
         for odl in odl_results:
             if (odl['test_status']['@status'] == "FAIL"):
                 nbFailures += 1
-        new_element.append({'x': data['creation_date'],
+        new_element.append({'x': data['start_date'],
                             'y1': len(odl_results),
                             'y2': nbFailures})
 
@@ -282,7 +288,7 @@ def format_ONOS_for_dashboard(results):
         new_duration = int(datetime.timedelta(hours=int(h),
                                               minutes=int(m),
                                               seconds=int(s)).total_seconds())
-        new_element.append({'x': data['creation_date'],
+        new_element.append({'x': data['start_date'],
                             'y': new_duration})
 
     test_data.append({'name': "ONOS FUNCvirNet duration ",
@@ -301,7 +307,7 @@ def format_ONOS_for_dashboard(results):
         for onos in onos_results:
             if (onos['Case result'] == "FAIL"):
                 nbFailures += 1
-        new_element.append({'x': data['creation_date'],
+        new_element.append({'x': data['start_date'],
                             'y1': len(onos_results),
                             'y2': nbFailures})
 
@@ -325,7 +331,7 @@ def format_ONOS_for_dashboard(results):
         new_duration = int(datetime.timedelta(hours=int(h),
                                               minutes=int(m),
                                               seconds=int(s)).total_seconds())
-        new_element.append({'x': data['creation_date'],
+        new_element.append({'x': data['start_date'],
                             'y': new_duration})
 
     test_data.append({'name': "ONOS FUNCvirNetL3 duration",
@@ -344,7 +350,7 @@ def format_ONOS_for_dashboard(results):
         for onos in onos_results:
             if (onos['Case result'] == "FAIL"):
                 nbFailures += 1
-        new_element.append({'x': data['creation_date'],
+        new_element.append({'x': data['start_date'],
                             'y1': len(onos_results),
                             'y2': nbFailures})
 
@@ -366,8 +372,8 @@ def format_Rally_for_dashboard(results):
     # ********************************
     new_element = []
     for data in results:
-        summary_cursor = len(data)
-        new_element.append({'x': data['creation_date'],
+        summary_cursor = len(data['details']) - 1
+        new_element.append({'x': data['start_date'],
                             'y': int(data['details'][summary_cursor]['summary']['duration'])})
 
     test_data.append({'name': "rally duration",
@@ -380,7 +386,7 @@ def format_Rally_for_dashboard(results):
     # ********************************
     new_element = []
     for data in results:
-        new_element.append({'x': data['creation_date'],
+        new_element.append({'x': data['start_date'],
                             'y': float(data['details'][summary_cursor]['summary']['nb success'])})
 
     test_data.append({'name': "rally success rate",
@@ -402,7 +408,7 @@ def format_vPing_for_dashboard(results):
     # ********************************
     new_element = []
     for data in results:
-        new_element.append({'x': data['creation_date'],
+        new_element.append({'x': data['start_date'],
                             'y': data['details']['duration']})
 
     test_data.append({'name': "vPing duration",
@@ -439,7 +445,7 @@ def format_vPing_userdata_for_dashboard(results):
     # ********************************
     new_element = []
     for data in results:
-        new_element.append({'x': data['creation_date'],
+        new_element.append({'x': data['start_date'],
                             'y': data['details']['duration']})
 
     test_data.append({'name': "vPing_userdata duration",