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

Use dictionary compare for changes

Browse source
This commit is contained in:
twangboy 2016-05-26 13:26:55 -06:00
parent 58d89d66e3
commit 1ae7dd76c1
2 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
salt/modules/win_servermanager.py
View file

@ -150,12 +150,16 @@ def install(feature, recurse=False):
'-WarningAction SilentlyContinue'.format(_cmd_quote(feature), sub)
out = _pshell_json(cmd)
ret = {'ExitCode': out['ExitCode'],
'DisplayName': out['FeatureResult'][0]['DisplayName'],
'RestartNeeded': out['FeatureResult'][0]['RestartNeeded'],
'Success': out['Success']}
return ret
if out['FeatureResult']:
return {'ExitCode': out['ExitCode'],
'DisplayName': out['FeatureResult'][0]['DisplayName'],
'RestartNeeded': out['FeatureResult'][0]['RestartNeeded'],
'Success': out['Success']}
else:
return {'ExitCode': out['ExitCode'],
'DisplayName': '{0} (already installed)'.format(feature),
'RestartNeeded': False,
'Success': out['Success']}
def remove(feature):

21
salt/states/win_servermanager.py
View file

@ -49,10 +49,11 @@ def installed(name, recurse=False, force=False):
'comment': ''}
# Determine if the feature is installed
if name not in __salt__['win_servermanager.list_installed']():
ret['changes'] = {'feature': '{0} will be installed recurse={1}'.format(name, recurse)}
old = __salt__['win_servermanager.list_installed']()
if name not in old:
ret['comment'] = '{0} will be installed recurse={1}'.format(name, recurse)
elif force and recurse:
ret['changes'] = {'feature': '{0} already installed but might install sub-features'.format(name)}
ret['comment'] = '{0} already installed but might install sub-features'.format(name)
else:
ret['comment'] = 'The feature {0} is already installed'.format(name)
return ret
@ -62,19 +63,23 @@ def installed(name, recurse=False, force=False):
return ret
# Install the features
ret['changes'] = {'feature': __salt__['win_servermanager.install'](name, recurse)}
status = __salt__['win_servermanager.install'](name, recurse)
if 'Success' in ret['changes']['feature']:
ret['result'] = ret['changes']['feature']['Success']
if 'Success' in status:
ret['result'] = status['Success']
if not ret['result']:
ret['comment'] = 'Failed to install {0}: {1}'.format(name, ret['changes']['feature']['ExitCode'])
else:
ret['comment'] = 'Installed {0}'.format(name)
if 'already installed' not in status['DisplayName']:
ret['changes']['feature'] = status
else:
ret['result'] = False
ret['comment'] = 'Failed to install {0}.\nError Message:\n{1}'.format(name, ret['changes']['feature'])
ret['changes'] = {}
new = __salt__['win_servermanager.list_installed']()
ret['changes'] = salt.utils.compare_dicts(old, new)
return ret