Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for timeout option in pillar file for junos proxy #51325

Merged
merged 9 commits into from
Jan 29, 2019
Merged

Add support for timeout option in pillar file for junos proxy #51325

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ea2357f
Added support for timeout option in pillar file
Jan 25, 2019
624bb94
Merge remote-tracking branch 'upstream1/updated_develop' into updated…
Jan 25, 2019
d6f4804
Merge branch 'develop' into updated_develop
rsmekala Jan 25, 2019
a61fdc6
Resolves SaltLint warnings for junos proxy
Jan 29, 2019
ea084a1
Merge remote-tracking branch 'upstream1/updated_develop' into updated…
Jan 29, 2019
3e662dd
Merge branch 'develop' into updated_develop
rsmekala Jan 29, 2019
8b6943e
Corrected log formatting as per review
Jan 29, 2019
b201d41
Merge remote-tracking branch 'upstream1/updated_develop' into updated…
Jan 29, 2019
1dfb7cc
Merge branch 'develop' into updated_develop
s0undt3ch Jan 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions salt/proxy/junos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,15 @@ def init(opts):
thisproxy['initialized'] = False
return

if 'timeout' in proxy_keys:
timeout = int(opts['proxy']['timeout'])
try:
thisproxy['conn'].timeout = timeout
except Exception as ex:
log.error('Not able to set timeout due to: %s', str(ex))
else:
log.debug('RPC timeout set to %d seconds', timeout)

try:
thisproxy['conn'].bind(cu=jnpr.junos.utils.config.Config)
except Exception as ex:
Expand Down