Merge "bugfix: _convert_duration error when encounter ':00:00.078149'"

[releng.git] / utils / test / scripts / mongo_to_elasticsearch.py

diff --git a/utils/test/scripts/mongo_to_elasticsearch.py b/utils/test/scripts/mongo_to_elasticsearch.py
index 193a6a5..caa68d8 100644 (file)
--- a/utils/test/scripts/mongo_to_elasticsearch.py
+++ b/utils/test/scripts/mongo_to_elasticsearch.py
@@ -16,10 +16,13 @@ file_handler.setFormatter(logging.Formatter('%(asctime)s %(levelname)s: %(messag
 logger.addHandler(file_handler)
 
 
-def _get_dicts_from_list(dict_list, keys):
+def _get_dicts_from_list(testcase, dict_list, keys):
     dicts = []
     for dictionary in dict_list:
         # iterate over dictionaries in input list
+        if not isinstance(dictionary, dict):
+            logger.info("Skipping non-dict details testcase [{}]".format(testcase))
+            continue
         if keys == set(dictionary.keys()):
             # check the dictionary structure
             dicts.append(dictionary)
@@ -93,7 +96,7 @@ def modify_functest_vims(testcase):
         -> details.orchestrator.duration
     """
     testcase_details = testcase['details']
-    sig_test_results = _get_dicts_from_list(testcase_details['sig_test']['result'],
+    sig_test_results = _get_dicts_from_list(testcase, testcase_details['sig_test']['result'],
                                             {'duration', 'result', 'name', 'error'})
     if len(sig_test_results) < 1:
         logger.info("No 'result' from 'sig_test' found in vIMS details, skipping")
@@ -141,10 +144,10 @@ def modify_functest_onos(testcase):
     testcase_details = testcase['details']
 
     funcvirnet_details = testcase_details['FUNCvirNet']['status']
-    funcvirnet_statuses = _get_dicts_from_list(funcvirnet_details, {'Case result', 'Case name:'})
+    funcvirnet_statuses = _get_dicts_from_list(testcase, funcvirnet_details, {'Case result', 'Case name:'})
 
     funcvirnetl3_details = testcase_details['FUNCvirNetL3']['status']
-    funcvirnetl3_statuses = _get_dicts_from_list(funcvirnetl3_details, {'Case result', 'Case name:'})
+    funcvirnetl3_statuses = _get_dicts_from_list(testcase, funcvirnetl3_details, {'Case result', 'Case name:'})
 
     if len(funcvirnet_statuses) < 0:
         logger.info("No results found in 'FUNCvirNet' part of ONOS results")
@@ -193,7 +196,7 @@ def modify_functest_rally(testcase):
         -> details.tests
         -> details.success_percentage
     """
-    summaries = _get_dicts_from_list(testcase['details'], {'summary'})
+    summaries = _get_dicts_from_list(testcase, testcase['details'], {'summary'})
 
     if len(summaries) != 1:
         logger.info("Found zero or more than one 'summaries' in Rally details, skipping")
@@ -218,7 +221,8 @@ def modify_functest_odl(testcase):
         -> details.failures
         -> details.success_percentage?
     """
-    test_statuses = _get_dicts_from_list(testcase['details']['details'], {'test_status', 'test_doc', 'test_name'})
+    test_statuses = _get_dicts_from_list(testcase, testcase['details']['details'],
+                                         {'test_status', 'test_doc', 'test_name'})
     if len(test_statuses) < 1:
         logger.info("No 'test_status' found in ODL details, skipping")
         return False
@@ -367,7 +371,7 @@ def publish_mongo_data(output_destination):
             for mongo_json_line in fobj:
                 test_result = json.loads(mongo_json_line)
                 if modify_mongo_entry(test_result):
-                    shared_utils.publish_json(test_result, output_destination, es_user, es_passwd)
+                    shared_utils.publish_json(test_result, es_user, es_passwd, output_destination)
     finally:
         if os.path.exists(tmp_filename):
             os.remove(tmp_filename)