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

add kwargs and adjust the match rule to exact match

Browse Source
This commit is contained in:
pengyao 2013-11-22 16:44:24 +08:00
parent 4a13b4d3b4
commit e76fd64a4e
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
salt/modules/lvs.py
View File

@ -406,7 +406,7 @@ def zero(protocol=None, service_address=None):
return ret
def check_service(protocol=None, service_address=None):
def check_service(protocol=None, service_address=None, **kwargs):
'''
Check the virtual service exists.
@ -418,8 +418,13 @@ def check_service(protocol=None, service_address=None):
salt '*' lvs.check_service tcp 1.1.1.1:80
'''
cmd = '{0} '.format(_build_cmd(protocol=protocol,
service_address=service_address))
cmd = '{0}'.format(_build_cmd(protocol=protocol,
service_address=service_address,
**kwargs))
# Exact match
if not kwargs:
cmd += ' '
all_rules = get_rules()
out = all_rules.find(cmd)
@ -429,7 +434,7 @@ def check_service(protocol=None, service_address=None):
ret = 'Error: service not exists'
return ret
def check_server(protocol=None, service_address=None, server_address=None):
def check_server(protocol=None, service_address=None, server_address=None, **kwargs):
'''
Check the real server exists in the specified service.
@ -441,9 +446,14 @@ def check_server(protocol=None, service_address=None, server_address=None):
salt '*' lvs.check_server tcp 1.1.1.1:80 192.168.0.11:8080
'''
cmd = '{0} '.format(_build_cmd(protocol=protocol,
cmd = '{0}'.format(_build_cmd(protocol=protocol,
service_address=service_address,
server_address=server_address))
server_address=server_address,
**kwargs))
# Exact match
if not kwargs:
cmd += ' '
all_rules = get_rules()
out = all_rules.find(cmd)