diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2017-03-31 02:46:48 +0000 |
|---|---|---|
| committer | Linda Wang <wangwulin@huawei.com> | 2017-06-01 10:55:45 +0000 |
| commit | 8e6b5934deef23386b8047b2f30a481ce42d32b8 (patch) | |
| tree | 73d8e69e49eba8efc7f7173c0b74f9c42bb79ae9 /functest/ci | |
| parent | 86aee2dcf004361b1516f28b0137b7c3fedfe8a5 (diff) | |
Use CONST to retrieve db_url rather than getter function
1. Remove get_db_url()
2. If TEST_DB_URL declared in env, update test_db_url in
config_functest.yaml file during env preparation
3. No matter TEST_DB_URL declared in env or not,
Result_DB = CONST.__getattribute__("results_test_db_url")
JIRA: FUNCTEST-763
Change-Id: I20da7ef98bbcc56731e0ff7061b05c1dde6cbfc3
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'functest/ci')
| -rwxr-xr-x | functest/ci/prepare_env.py | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py index 8e17a4fc..e03bc654 100755 --- a/functest/ci/prepare_env.py +++ b/functest/ci/prepare_env.py @@ -234,12 +234,15 @@ def source_rc_file(): CONST.__setattr__('OS_PASSWORD', value) -def patch_config_file(): +def update_config_file(): patch_file(CONFIG_PATCH_PATH) if pod_arch and pod_arch in arch_filter: patch_file(CONFIG_AARCH64_PATCH_PATH) + if "TEST_DB_URL" in os.environ: + update_db_url() + def patch_file(patch_file_path): logger.debug('Updating file: %s', patch_file_path) @@ -257,7 +260,15 @@ def patch_file(patch_file_path): os.remove(CONFIG_FUNCTEST_PATH) with open(CONFIG_FUNCTEST_PATH, "w") as f: f.write(yaml.dump(new_functest_yaml, default_style='"')) - f.close() + + +def update_db_url(): + with open(CONFIG_FUNCTEST_PATH) as f: + functest_yaml = yaml.safe_load(f) + + with open(CONFIG_FUNCTEST_PATH, "w") as f: + functest_yaml["results"]["test_db_url"] = os.environ.get('TEST_DB_URL') + f.write(yaml.dump(functest_yaml, default_style='"')) def verify_deployment(): @@ -381,7 +392,7 @@ def main(**kwargs): get_deployment_handler() create_directories() source_rc_file() - patch_config_file() + update_config_file() verify_deployment() install_rally() install_tempest() |