valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #26069 from jfindlay/win_fire

Browse Source 
fix win_firewall.delete_rule
This commit is contained in:
Mike Place 2015-08-06 12:49:28 -06:00
commit 8f2e542b2b
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
salt/modules/win_firewall.py
View File

@ -6,13 +6,17 @@ from __future__ import absolute_import
# Import python libs
import re
import logging
# Import salt libs
import salt.utils
from salt.ext import six
# Define the module's virtual name
__virtualname__ = 'firewall'
log = logging.getLogger(__name__)
def __virtual__():
'''
@ -119,11 +123,18 @@ def add_rule(name, localport, protocol='tcp', action='allow', dir='in'):
'dir={0}'.format(dir),
'localport={0}'.format(localport),
'action={0}'.format(action)]
return __salt__['cmd.run'](cmd, python_shell=False) == 'Ok.'
ret = __salt__['cmd.run'](cmd, python_shell=False)
if isinstance(ret, six.string_types):
return ret.strip() == 'Ok.'
else:
log.error('firewall.add_rule failed: {0}'.format(ret))
return False
def delete_rule(name, localport, protocol='tcp', dir='in'):
'''
.. versionadded:: 2015.8.0
Delete an existing firewall rule
CLI Example:
@ -137,4 +148,9 @@ def delete_rule(name, localport, protocol='tcp', dir='in'):
'protocol={0}'.format(protocol),
'dir={0}'.format(dir),
'localport={0}'.format(localport)]
return __salt__['cmd.run'](cmd, python_shell=False) == 'Ok.'
ret = __salt__['cmd.run'](cmd, python_shell=False)
if isinstance(ret, six.string_types):
return ret.endswith('Ok.')
else:
log.error('firewall.delete_rule failed: {0}'.format(ret))
return False