cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pass module timeout value to fetch_url in eapi connection (#18633)

Browse source 
This change causes the eapi connection to honor the module timeout
value when calling fetch_url
This commit is contained in:
Peter Sprygada 2016-11-26 22:22:55 -05:00 committed by GitHub
parent ec2521f6af
commit eec6980f3e
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_utils/eos.py
View file

@ -166,6 +166,7 @@ class Eapi(EosConfigMixin):
self.url_args.params['url_username'] = params['username'] self.url_args.params['url_username'] = params['username']
self.url_args.params['url_password'] = params['password'] self.url_args.params['url_password'] = params['password']
self.url_args.params['validate_certs'] = params['validate_certs'] self.url_args.params['validate_certs'] = params['validate_certs']
self.url_args.params['timeout'] = params['timeout']
if params['use_ssl']: if params['use_ssl']:
proto = 'https' proto = 'https'
@ -205,10 +206,11 @@ class Eapi(EosConfigMixin):
data = json.dumps(body) data = json.dumps(body)
headers = {'Content-Type': 'application/json-rpc'} headers = {'Content-Type': 'application/json-rpc'}
timeout = self.url_args['timeout']
response, headers = fetch_url( response, headers = fetch_url(
self.url_args, self.url, data=data, headers=headers, self.url_args, self.url, data=data, headers=headers,
method='POST' method='POST', timeout=timeout
) )
if headers['status'] != 200: if headers['status'] != 200: