summaryrefslogtreecommitdiffstats
path: root/ci/prepare_env.py
diff options
context:
space:
mode:
Diffstat (limited to 'ci/prepare_env.py')
-rwxr-xr-xci/prepare_env.py30
1 files changed, 15 insertions, 15 deletions
diff --git a/ci/prepare_env.py b/ci/prepare_env.py
index 49dcdd505..63a0ad4a8 100755
--- a/ci/prepare_env.py
+++ b/ci/prepare_env.py
@@ -20,11 +20,11 @@ import subprocess
import sys
import argparse
+import yaml
+
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
import functest.utils.openstack_utils as os_utils
-import yaml
-from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO
actions = ['start', 'check']
parser = argparse.ArgumentParser()
@@ -48,21 +48,21 @@ CONFIG_FUNCTEST_PATH = os.environ["CONFIG_FUNCTEST_YAML"]
CONFIG_PATCH_PATH = os.path.join(os.path.dirname(
CONFIG_FUNCTEST_PATH), "config_patch.yaml")
-functest_yaml = ft_utils.get_functest_yaml()
-
with open(CONFIG_PATCH_PATH) as f:
functest_patch_yaml = yaml.safe_load(f)
-FUNCTEST_CONF_DIR = functest_yaml.get("general").get(
- "directories").get("dir_functest_conf")
+FUNCTEST_CONF_DIR = \
+ ft_utils.get_functest_config('general.directories.dir_functest_conf')
+
-FUNCTEST_DATA_DIR = functest_yaml.get("general").get(
- "directories").get("dir_functest_data")
-FUNCTEST_RESULTS_DIR = functest_yaml.get("general").get(
- "directories").get("dir_results")
-DEPLOYMENT_MAME = functest_yaml.get("rally").get("deployment_name")
-TEMPEST_REPO_DIR = functest_yaml.get("general").get(
- "directories").get("dir_repo_tempest")
+FUNCTEST_DATA_DIR = \
+ ft_utils.get_functest_config('general.directories.dir_functest_data')
+FUNCTEST_RESULTS_DIR = \
+ ft_utils.get_functest_config('general.directories.dir_results')
+DEPLOYMENT_MAME = \
+ ft_utils.get_functest_config('rally.deployment_name')
+TEMPEST_REPO_DIR = \
+ ft_utils.get_functest_config('general.directories.dir_repo_tempest')
ENV_FILE = FUNCTEST_CONF_DIR + "/env_active"
@@ -191,7 +191,7 @@ def patch_config_file():
for key in functest_patch_yaml:
if key in CI_SCENARIO:
new_functest_yaml = dict(ft_utils.merge_dicts(
- functest_yaml, functest_patch_yaml[key]))
+ ft_utils.get_functest_yaml(), functest_patch_yaml[key]))
updated = True
if updated:
@@ -204,7 +204,7 @@ def patch_config_file():
def verify_deployment():
print_separator()
logger.info("Verifying OpenStack services...")
- cmd = ("%s/ci/check_os.sh" % FUNCTEST_REPO)
+ cmd = ("%s/ci/check_os.sh" % ft_utils.FUNCTEST_REPO)
logger.debug("Executing command: %s" % cmd)
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True)