Merge "Stop updating test_db_url in config file by env var"

[functest.git] / functest / utils / functest_utils.py

diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index bf68e43..bbb6b63 100644 (file)
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -68,33 +68,6 @@ def download_url(url, dest_path):
 #               CI UTILS
 #
 # -----------------------------------------------------------
-def get_installer_type():
-    """
-    Get installer type (fuel, apex, joid, compass)
-    """
-    try:
-        installer = os.environ['INSTALLER_TYPE']
-    except KeyError:
-        logger.error("Impossible to retrieve the installer type")
-        installer = "Unknown_installer"
-
-    return installer
-
-
-def get_scenario():
-    """
-    Get scenario
-    """
-    try:
-        scenario = os.environ['DEPLOY_SCENARIO']
-    except KeyError:
-        logger.info("Impossible to retrieve the scenario."
-                    "Use default os-nosdn-nofeature-noha")
-        scenario = "os-nosdn-nofeature-noha"
-
-    return scenario
-
-
 def get_version():
     """
     Get version
@@ -117,25 +90,12 @@ def get_version():
         return "unknown"
 
 
-def get_pod_name():
-    """
-    Get PoD Name from env variable NODE_NAME
-    """
-    try:
-        return os.environ['NODE_NAME']
-    except KeyError:
-        logger.info(
-            "Unable to retrieve the POD name from environment. " +
-            "Using pod name 'unknown-pod'")
-        return "unknown-pod"
-
-
 def logger_test_results(project, case_name, status, details):
     """
     Format test case results for the logger
     """
-    pod_name = get_pod_name()
-    scenario = get_scenario()
+    pod_name = CONST.__getattribute__('NODE_NAME')
+    scenario = CONST.__getattribute__('DEPLOY_SCENARIO')
     version = get_version()
     build_tag = CONST.__getattribute__('BUILD_TAG')
     db_url = CONST.__getattribute__("results_test_db_url")
@@ -170,7 +130,10 @@ def push_results_to_db(project, case_name,
     POST results to the Result target DB
     """
     # Retrieve params from CI and conf
-    url = CONST.__getattribute__("results_test_db_url")
+    if (hasattr(CONST, 'TEST_DB_URL')):
+        url = CONST.__getattribute__('TEST_DB_URL')
+    else:
+        url = CONST.__getattribute__("results_test_db_url")
 
     try:
         installer = os.environ['INSTALLER_TYPE']