aboutsummaryrefslogtreecommitdiffstats
path: root/functest/utils/functest_utils.py
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-08-28 19:47:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-28 19:47:15 +0000
commitba459114a5dfd1efe5e817fdc8a172bfb4dc0a3e (patch)
tree8a8fc33d077f97143e9a9f378280a15c38a63c7e /functest/utils/functest_utils.py
parent71e287712d1f59e442603af244ff3230a6333e44 (diff)
parent9cd065bd3ce2544ced1ace605da0d77c1b59cb3b (diff)
Merge "Obtain scenario by CONST instead of get function"
Diffstat (limited to 'functest/utils/functest_utils.py')
-rw-r--r--functest/utils/functest_utils.py16
1 files changed, 1 insertions, 15 deletions
diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index 5bf3adb63..a7c61ce15 100644
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -81,20 +81,6 @@ def get_installer_type():
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
@@ -122,7 +108,7 @@ def logger_test_results(project, case_name, status, details):
Format test case results for the logger
"""
pod_name = CONST.__getattribute__('NODE_NAME')
- scenario = get_scenario()
+ scenario = CONST.__getattribute__('DEPLOY_SCENARIO')
version = get_version()
build_tag = CONST.__getattribute__('BUILD_TAG')
db_url = CONST.__getattribute__("results_test_db_url")