Bugfix: ODL report to DB fails

JIRA: FUNCTEST-370

Change-Id: I48c8927f3490b86fcf1c95656324429b70201653
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 82a7a31..7e57cd5 100755 (executable)
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -87,15 +87,15 @@ function run_test(){
                 --odlip $odl_ip --odlwebport $odl_port
 
             # push results to the DB in case of CI
-            # if [[ "$report" == "-r" &&
-            #       -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" &&
-            #       -n "$INSTALLER_TYPE" && "$INSTALLER_TYPE" != "none" ]] &&
-            #    env | grep NODE_NAME > /dev/null; then
-            #     odl_logs="/home/opnfv/functest/results/odl/"
-            #     odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/"
-            #     node_name=$(env | grep NODE_NAME | cut -f2 -d'=')
-            #     python ${odl_path}/odlreport2db.py -x ${odl_logs}/output.xml -i ${INSTALLER_TYPE} -p ${node_name} -s ${DEPLOY_SCENARIO}
-            # fi
+            if [[ "$report" == "-r" &&
+                  -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" &&
+                  -n "$INSTALLER_TYPE" && "$INSTALLER_TYPE" != "none" ]] &&
+               env | grep NODE_NAME > /dev/null; then
+                odl_logs="/home/opnfv/functest/results/odl/"
+                odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/"
+                node_name=$(env | grep NODE_NAME | cut -f2 -d'=')
+                python ${odl_path}/odlreport2db.py -x ${odl_logs}/output.xml -i ${INSTALLER_TYPE} -p ${node_name} -s ${DEPLOY_SCENARIO}
+            fi
         ;;
         "tempest_smoke_serial")
             python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \

diff --git a/testcases/Controllers/ODL/odlreport2db.py b/testcases/Controllers/ODL/odlreport2db.py
index 0c9f341..368d266 100755 (executable)
--- a/testcases/Controllers/ODL/odlreport2db.py
+++ b/testcases/Controllers/ODL/odlreport2db.py
@@ -66,12 +66,16 @@ def parse_test(tests, details):
 def parse_suites(suites):
     data = {}
     details = []
-    try:
-        for suite in suites:
-            data['details'] = parse_test(suite['test'], details)
-    except TypeError:
-        # suites is not iterable
-        data['details'] = parse_test(suites['test'], details)
+    for suite in suites:
+        a = suite['suite']
+        if type(a) == list:
+            for b in a:
+                data['details'] = parse_test(b['test'], details)
+        else:
+            data['details'] = parse_test(a['test'], details)
+
+        # data['details'] = parse_test(suite['test'], details)
+    # suites is not iterable
     return data