diff options
| author |   zhifeng.jiang <jiang.zhifeng@zte.com.cn> | 2016-05-20 15:56:13 +0800 |
|---|---|---|
| committer | zhifeng.jiang <jiang.zhifeng@zte.com.cn> | 2016-05-23 08:37:48 +0800 |
| commit | 1dd916e557d60a05dcedc0e741ab7cbb94f85c64 (patch) | |
| tree | f75bdccf86d853f295813cde9b129b1695f2a033 /func/cli.py | |
| parent | 4c22b78737cca49bc6459b10e7f7b6e550d56d63 (diff) | |
Read the proxy info from testcase, and set it to hosts when dhrystone benchmarks test.
modification:
Write the git_proxy_pbook.yaml to set git proxy info in hosts or vms.
Write the sys_proxy_pbook.yaml to set yum apt wget env proxy info in hosts or vms.
Change the dhrystone.yaml to include proxy and add the zte-pod1 /compute/dhrystone_bm.yaml.Tested and passed.Other playbooks did not include the proxy yet. I will test and push lately.
QTIP-74
Change-Id: Ia820bc32798b9f1f6f4165a111524e04c129a5df
Signed-off-by: zhifeng.jiang <jiang.zhifeng@zte.com.cn>
Diffstat (limited to 'func/cli.py')
| -rw-r--r-- | func/cli.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/func/cli.py b/func/cli.py index a99e9d0f..1f3e96f2 100644 --- a/func/cli.py +++ b/func/cli.py @@ -87,7 +87,7 @@ class cli(): obj='' obj = Env_setup() if os.path.isfile('./test_cases/'+args.lab.lower()+'/'+suite[0]+'/' +benchmarks[items]): - [benchmark, roles, vm_info, benchmark_details, pip] = obj.parse('./test_cases/' + [benchmark, roles, vm_info, benchmark_details, pip, proxy_info] = obj.parse('./test_cases/' +args.lab.lower()+'/'+suite[0]+'/'+benchmarks[items]) if len(vm_info) != 0: @@ -101,7 +101,8 @@ class cli(): obj.roles_dict.items(), self._get_fname(benchmarks[items]), benchmark_details, - obj.ip_pw_dict.items()) + obj.ip_pw_dict.items(), + proxy_info) else: print (args.benchmark, ' is not a Template in the Directory - \ Enter a Valid file name. or use qtip.py -h for list') |