diff options
| author |   meimei <meimei@huawei.com> | 2016-07-28 02:00:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-28 02:00:39 +0000 |
| commit | c944039b76100d5df09208ce5cd733e363f50aef (patch) | |
| tree | fd174c27dff03fce803701fd315d4cf1d12fb4e0 /testcases | |
| parent | 166b7343ef41b658b2617290bdbad610a9bde22e (diff) | |
| parent | cbd10ee5a286c4f9eab71e412888d3ef9f4df4e4 (diff) | |
Merge "[bugfix] issures in multisite testcase"
Diffstat (limited to 'testcases')
| -rwxr-xr-x | testcases/OpenStack/tempest/run_tempest.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index c60766804..8ca3bdb3f 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -233,9 +233,6 @@ def configure_tempest_feature(deployment_dir, mode): installer_password = ft_utils.get_parameter_from_yaml( "multisite." + installer_type + "_environment.installer_password") - multisite_controller_ip = ft_utils.get_parameter_from_yaml( - "multisite." + installer_type + - "_environment.multisite_controller_ip") ssh_options = "-o UserKnownHostsFile=/dev/null -o \ StrictHostKeyChecking=no" @@ -248,7 +245,7 @@ def configure_tempest_feature(deployment_dir, mode): installer_username, installer_ip) multisite_controller_ip = \ - "".join(os.popen(cmd).reawd().split()) + "".join(os.popen(cmd).read().split()) # Login to controller and get bind host details cmd = 'sshpass -p %s ssh 2>/dev/null %s %s@%s "ssh %s \\" \ @@ -308,7 +305,7 @@ def generate_test_list(deployment_dir, mode): if mode == 'smoke': testr_mode = "smoke" elif mode == 'feature_multisite': - testr_mode = " | grep kingbird " + testr_mode = " | grep -i kingbird " elif mode == 'full': testr_mode = "" else: |