diff options
author | Nauman Ahad <nauman.ahad@xflowresearch.com> | 2016-06-01 18:44:39 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-01 18:44:39 +0000 |
commit | 6a75ef2591b93d05c96a9aace7266dcf952fa495 (patch) | |
tree | 911167262797ba3bd23b5fba60e57295a2a48424 /func/env_setup.py | |
parent | 052df6190466f5b9f2722fa1885cf08f6da1e629 (diff) | |
parent | 1dd916e557d60a05dcedc0e741ab7cbb94f85c64 (diff) |
Merge "Read the proxy info from testcase, and set it to hosts when dhrystone benchmarks test."
Diffstat (limited to 'func/env_setup.py')
-rw-r--r-- | func/env_setup.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/func/env_setup.py b/func/env_setup.py index 9fd7c106..487d7af3 100644 --- a/func/env_setup.py +++ b/func/env_setup.py @@ -31,6 +31,7 @@ class Env_setup(): self.roles_dict.clear() self.ip_pw_dict.clear() self.ip_pip_list[:] = [] + self.proxy_info = {} self.vm_parameters.clear() self.benchmark_details.clear() self.benchmark = '' @@ -141,6 +142,10 @@ class Env_setup(): self.GetHostMachineinfo(doc['Context']['Host_Machines']) if doc.get('Scenario',{}).get('benchmark_details',{}): self.GetBenchmarkDetails(doc.get('Scenario',{}).get('benchmark_details',{})) + if 'Proxy_Environment' in doc['Context'].keys(): + self.proxy_info['http_proxy'] = doc['Context']['Proxy_Environment']['http_proxy'] + self.proxy_info['https_proxy'] = doc['Context']['Proxy_Environment']['https_proxy'] + self.proxy_info['no_proxy'] = doc['Context']['Proxy_Environment']['no_proxy'] for k, v in self.roles_ip_list: self.roles_dict[k].append(v) for k, v in self.ip_pw_list: @@ -150,7 +155,9 @@ class Env_setup(): self.roles_dict.items(), self.vm_parameters, self.benchmark_details.items(), - self.ip_pw_dict.items()) + self.ip_pw_dict.items(), + self.proxy_info) + except KeyboardInterrupt: fname.close() print 'ConfigFile Closed: exiting!' |