diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-02-08 10:54:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-02-08 10:54:25 +0000 |
| commit | fd31912d7e77ff6dffed41d21630fc26748662c9 (patch) | |
| tree | 2322c2656a468942e37cea076fdf946049191b21 | |
| parent | 03b83a550137b8a69b953c574f90513f5034204c (diff) | |
| parent | 04cf934e24b0f7e0c53125711b4e98c14d54f049 (diff) | |
Merge "Added configuration of ssh_user_regex parameter"
| -rw-r--r-- | testcases/VIM/OpenStack/CI/libraries/run_tempest.py | 5 | ||||
| -rw-r--r-- | testcases/config_functest.yaml | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py index 6b153057..5738fd47 100644 --- a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py +++ b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py @@ -73,6 +73,7 @@ TENANT_NAME = functest_yaml.get("tempest").get("identity").get("tenant_name") TENANT_DESCRIPTION = functest_yaml.get("tempest").get("identity").get("tenant_description") USER_NAME = functest_yaml.get("tempest").get("identity").get("user_name") USER_PASSWORD = functest_yaml.get("tempest").get("identity").get("user_password") +SSH_USER_REGEX = functest_yaml.get("tempest").get("input-scenario").get("ssh_user_regex") DEPLOYMENT_MAME = functest_yaml.get("rally").get("deployment_name") RALLY_INSTALLATION_DIR = functest_yaml.get("general").get("directories").get("dir_rally_inst") RESULTS_DIR = functest_yaml.get("general").get("directories").get("dir_results") @@ -202,6 +203,10 @@ def configure_tempest(): cmd = "crudini --set "+tempest_conf_file+" identity password " \ +USER_PASSWORD functest_utils.execute_command(cmd,logger) + cmd = "crudini --set "+tempest_conf_file+" input-scenario ssh_user_regex " \ + +SSH_USER_REGEX + functest_utils.execute_command(cmd,logger) + # Copy tempest.conf to /home/opnfv/functest/results/tempest/ print shutil.copyfile(tempest_conf_file,TEMPEST_RESULTS_DIR+'/tempest.conf') diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml index 28455a3b..6d2f4c1b 100644 --- a/testcases/config_functest.yaml +++ b/testcases/config_functest.yaml @@ -82,6 +82,8 @@ tempest: tenant_description: Tenant for Tempest test suite user_name: tempest user_password: tempest + input-scenario: + ssh_user_regex: [["^.*[Cc]irros.*$", "cirros"], ["^.*[Tt]est[VvMm].*$", "cirros"], ["^.*rally_verify.*$", "cirros"]] rally: deployment_name: opnfv-rally |