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

Improve napalm state output in debug mode

Browse source
This commit is contained in:
Mircea Ulinic 2017-08-24 11:05:32 +00:00
parent 44b3caead1
commit 3634055e34
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/utils/napalm.py
View file

@ -435,10 +435,8 @@ def default_ret(name):
def loaded_ret(ret, loaded, test, debug):
'''
Return the final state output.
ret
The initial state output structure.
loaded
The loaded dictionary.
'''
@ -447,9 +445,6 @@ def loaded_ret(ret, loaded, test, debug):
'comment': loaded.get('comment', '')
})
pchanges = {}
if not loaded.get('result', False):
# Failure of some sort
return ret
if debug:
# Always check for debug
pchanges.update({
@ -458,6 +453,15 @@ def loaded_ret(ret, loaded, test, debug):
ret.update({
"pchanges": pchanges
})
if not loaded.get('result', False):
# Failure of some sort
if debug:
ret['comment'] = '{base_err}\n\nLoaded config:\n\n{loaded_cfg}'.format(base_err=ret['comment'],
loaded_cfg=loaded['loaded_config'])
if loaded.get('diff'):
ret['comment'] = '{comment_base}\n\nConfiguration diff:\n\n{diff}'.format(comment_base=ret['comment'],
diff=loaded['diff'])
return ret
if not loaded.get('already_configured', True):
# We're making changes
pchanges.update({
@ -484,6 +488,7 @@ def loaded_ret(ret, loaded, test, debug):
return ret
# No changes
ret.update({
'result': True
'result': True,
'changes': {}
})
return ret