cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Simplify node matching

Browse source
This commit is contained in:
Matt Martz 2014-04-06 19:17:13 -05:00
parent 9a19792eff
commit a191688c71
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cloud/rax_clb_nodes
View file

@ -137,19 +137,18 @@ def _activate_virtualenv(path):
def _get_node(lb, node_id=None, address=None, port=None): def _get_node(lb, node_id=None, address=None, port=None):
"""Return a matching node""" """Return a matching node"""
searches = {
'id': node_id,
'address': address,
'port': port
}
for node in getattr(lb, 'nodes', []): for node in getattr(lb, 'nodes', []):
try: match_list = []
if all(getattr(node, attr) == value if node_id is not None:
for (attr, value) in searches.items() if value is not None): match_list.append(getattr(node, 'id', None) == node_id)
if address is not None:
match_list.append(getattr(node, 'address', None) == address)
if port is not None:
match_list.append(getattr(node, 'port', None) == port)
if match_list and all(match_list):
return node return node
except AttributeError:
continue
return None return None