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

Merge branch 'danslimmon-devel' into devel

Browse source
This commit is contained in:
James Cammarata 2014-07-10 12:26:15 -05:00
commit 2016406b12
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/inventory/__init__.py
View file

@ -235,6 +235,10 @@ class Inventory(object):
a tuple of (start, stop) or None
"""
# Do not parse regexes for enumeration info
if pattern.startswith('~'):
return (pattern, None)
# The regex used to match on the range, which can be [x] or [x-y].
pattern_re = re.compile("^(.*)\[([-]?[0-9]+)(?:(?:-)([0-9]+))?\](.*)$")
m = pattern_re.match(pattern)

8
test/units/TestInventory.py
View file

@ -274,6 +274,14 @@ class TestInventory(unittest.TestCase):
print "EXPECTED=%s" % sorted(expected_hosts)
assert sorted(hosts) == sorted(expected_hosts)
def test_regex_grouping(self):
inventory = self.simple_inventory()
hosts = inventory.list_hosts("~(cer[a-z]|berc)(erus00[13])")
expected_hosts = ['cerberus001', 'cerberus003']
print "HOSTS=%s" % sorted(hosts)
print "EXPECTED=%s" % sorted(expected_hosts)
assert sorted(hosts) == sorted(expected_hosts)
def test_complex_enumeration(self):