saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2018.3' into win_wusa

Browse source
This commit is contained in:
Thomas S Hatch 2018-12-28 13:55:12 -07:00 • committed by GitHub
commit 0e925282e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/states/junos.py
View file

@ -202,7 +202,7 @@ def diff(name, d_id):
return ret
def cli(name, format='text', **kwargs):
def cli(name, **kwargs):
'''
Executes the CLI commands and reuturns the text output.
@ -218,10 +218,10 @@ def cli(name, format='text', **kwargs):
* command:
The command that need to be executed on Junos CLI. (default = None)
Optional
* format:
Format in which to get the CLI output. (text or xml, \
default = 'text')
* kwargs: Keyworded arguments which can be provided like-
* format:
Format in which to get the CLI output. (text or xml, \
default = 'text')
* timeout:
Set NETCONF RPC timeout. Can be used for commands which
take a while to execute. (default = 30 seconds)
@ -230,7 +230,7 @@ def cli(name, format='text', **kwargs):
(default = None)
'''
ret = {'name': name, 'changes': {}, 'result': True, 'comment': ''}
ret['changes'] = __salt__['junos.cli'](name, format, **kwargs)
ret['changes'] = __salt__['junos.cli'](name, **kwargs)
return ret