Enable PYTHONPATH env variable inside the container

[functest.git] / testcases / features / doctor.py

diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py
index 52ffaa9..9ca6bf6 100644 (file)
--- a/testcases/features/doctor.py
+++ b/testcases/features/doctor.py
@@ -15,11 +15,10 @@
 #
 
 import logging
-import os
-import sys
 import time
 import yaml
 
+import functest_utils
 
 with open('/home/opnfv/functest/conf/config_functest.yaml') as f:
     functest_yaml = yaml.safe_load(f)
@@ -29,14 +28,12 @@ FUNCTEST_REPO = dirs.get('dir_repo_functest')
 DOCTOR_REPO = dirs.get('dir_repo_doctor')
 TEST_DB_URL = functest_yaml.get('results').get('test_db_url')
 
-sys.path.append('%s/testcases' % FUNCTEST_REPO)
-import functest_utils
-
 logger = logging.getLogger('doctor')
 logger.setLevel(logging.DEBUG)
 ch = logging.StreamHandler()
 ch.setLevel(logging.DEBUG)
-formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - ' +
+                              '%(message)s')
 ch.setFormatter(formatter)
 logger.addHandler(ch)
 
@@ -63,19 +60,27 @@ def main():
     }
     pod_name = functest_utils.get_pod_name(logger)
     scenario = functest_utils.get_scenario(logger)
+    version = scenario
     build_tag = functest_utils.get_build_tag(logger)
+
+    status = "failed"
+    if details['status'] == "OK":
+        status = "passed"
+
     logger.info("Pushing result: TEST_DB_URL=%(db)s pod_name=%(pod)s "
-                "scenario=%(s)s details=%(d)s" % {
+                "version=%(v)s scenario=%(s)s criteria=%(c)s details=%(d)s" % {
                     'db': TEST_DB_URL,
                     'pod': pod_name,
+                    'v': version,
                     's': scenario,
+                    'c': status,
                     'b': build_tag,
                     'd': details,
                 })
     functest_utils.push_results_to_db(TEST_DB_URL,
-                                      'doctor','doctor-notification',
-                                      logger, pod_name, scenario,
-                                      build_tag, details)
+                                      'doctor', 'doctor-notification',
+                                      logger, pod_name, version, scenario,
+                                      status, build_tag, details)
 
 
 if __name__ == '__main__':