diff options
| author |   zhifeng.jiang <jiang.zhifeng@zte.com.cn> | 2016-09-09 13:17:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-09 13:17:14 +0000 |
| commit | 3a987ca748287d250d7975a853222917f001469a (patch) | |
| tree | bc5bb80397c015c37fb0c92b072b62cdbac02a15 /func/args_handler.py | |
| parent | 84d204b3a1e68238105f9fe6cd9b02591dde6ca6 (diff) | |
| parent | 6612d7c20e329cd5b133a41a6b35c67539f3369b (diff) | |
Merge "Remove os environment in driver.py so that it can be called by restful server"
Diffstat (limited to 'func/args_handler.py')
| -rw-r--r-- | func/args_handler.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/func/args_handler.py b/func/args_handler.py index f2726eb8..57ecfcbd 100644 --- a/func/args_handler.py +++ b/func/args_handler.py @@ -48,12 +48,15 @@ def prepare_ansible_env(benchmark_test_case): return benchmark, benchmark_details, proxy_info, env_setup -def run_benchmark(benchmark, benchmark_details, proxy_info, env_setup, benchmark_test_case): +def run_benchmark(installer_type, pwd, benchmark, benchmark_details, + proxy_info, env_setup, benchmark_test_case): driver = Driver() - driver.drive_bench(benchmark, env_setup.roles_dict.items(), _get_f_name(benchmark_test_case), + driver.drive_bench(installer_type, pwd, benchmark, + env_setup.roles_dict.items(), _get_f_name(benchmark_test_case), benchmark_details, env_setup.ip_pw_dict.items(), proxy_info) -def prepare_and_run_benchmark(benchmark_test_case): +def prepare_and_run_benchmark(installer_type, pwd, benchmark_test_case): benchmark, benchmark_details, proxy_info, env_setup = prepare_ansible_env(benchmark_test_case) - run_benchmark(benchmark, benchmark_details, proxy_info, env_setup, benchmark_test_case) + run_benchmark(installer_type, pwd, benchmark, benchmark_details, + proxy_info, env_setup, benchmark_test_case) |