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

Lint and fix

Browse source
This commit is contained in:
Mircea Ulinic 2017-08-24 13:20:45 +00:00
parent 1cd33cbaa9
commit c10717dc89
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/states/netyang.py
View file

@ -38,7 +38,6 @@ except ImportError:
HAS_NAPALM_YANG = False
# Import salt modules
import salt.output
from salt.utils import fopen
import salt.utils.napalm

5
salt/utils/napalm.py
View file

@ -24,6 +24,7 @@ from functools import wraps
log = logging.getLogger(__file__)
import salt.utils
import salt.output
# Import third party lib
try:
@ -454,10 +455,10 @@ def loaded_ret(ret, loaded, test, debug, compliance_report=False, opts=None):
if debug and 'loaded_config' in loaded:
changes['loaded_config'] = loaded['loaded_config']
pchanges['loaded_config'] = loaded['loaded_config']
ret['pchanges']= pchanges
ret['pchanges'] = pchanges
if changes.get('diff'):
ret['comment'] = '{comment_base}\n\nConfiguration diff:\n\n{diff}'.format(comment_base=ret['comment'],
diff=pchanges['diff'])
diff=changes['diff'])
if changes.get('loaded_config'):
ret['comment'] = '{comment_base}\n\nLoaded config:\n\n{loaded_cfg}'.format(
comment_base=ret['comment'],