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 in remove

Browse source
This commit is contained in:
twangboy 2016-05-26 13:51:10 -06:00
parent 1ae7dd76c1
commit 193583be96
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
salt/modules/win_servermanager.py
View file

@ -189,9 +189,13 @@ def remove(feature):
'-WarningAction SilentlyContinue'.format(_cmd_quote(feature))
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} (not installed)'.format(feature),
'RestartNeeded': False,
'Success': out['Success']}

29
salt/states/win_servermanager.py
View file

@ -65,17 +65,11 @@ def installed(name, recurse=False, force=False):
# Install the features
status = __salt__['win_servermanager.install'](name, recurse)
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'])
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'] = {}
ret['result'] = status['Success']
if not ret['result']:
ret['comment'] = 'Failed to install {0}: {1}'.format(name, ret['changes']['feature']['ExitCode'])
if 'already installed' not in status['DisplayName']:
ret['changes']['feature'] = status
new = __salt__['win_servermanager.list_installed']()
ret['changes'] = salt.utils.compare_dicts(old, new)
@ -112,8 +106,9 @@ def removed(name):
'changes': {},
'comment': ''}
# Determine if the feature is installed
if name in __salt__['win_servermanager.list_installed']():
ret['changes'] = {'feature': '{0} will be removed'.format(name)}
old = __salt__['win_servermanager.list_installed']()
if name in old:
ret['comment'] = '{0} will be removed'.format(name)
else:
ret['comment'] = 'The feature {0} is not installed'.format(name)
return ret
@ -123,9 +118,13 @@ def removed(name):
return ret
# Remove the features
ret['changes'] = {'feature': __salt__['win_servermanager.remove'](name)}
ret['result'] = ret['changes']['feature']['Success']
status = __salt__['win_servermanager.remove'](name)
ret['result'] = status['Success']
if not ret['result']:
ret['comment'] = 'Failed to uninstall the feature {0}'.format(ret['changes']['feature']['ExitCode'])
new = __salt__['win_servermanager.list_installed']()
ret['changes'] = salt.utils.compare_dicts(old, new)
return ret