ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Allow leading ranges in the inventory host entries.

Browse source
This commit is contained in:
Martynas Mickevicius 2013-10-03 11:41:34 +03:00
parent 6480945184
commit 44279ce34f
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/inventory/expand_hosts.py
View file

@ -41,8 +41,7 @@ def detect_range(line = None):
Returnes True if the given line contains a pattern, else False. Returnes True if the given line contains a pattern, else False.
''' '''
if (not line.startswith("[") and if (line.find("[") != -1 and
line.find("[") != -1 and
line.find(":") != -1 and line.find(":") != -1 and
line.find("]") != -1 and line.find("]") != -1 and
line.index("[") < line.index(":") < line.index("]")): line.index("[") < line.index(":") < line.index("]")):

2
lib/ansible/inventory/ini.py
View file

@ -65,7 +65,7 @@ class InventoryParser(object):
active_group_name = 'ungrouped' active_group_name = 'ungrouped'
for line in self.lines: for line in self.lines:
if line.startswith("["): if line.startswith("[") and line.strip().endswith("]"):
active_group_name = line.split(" #")[0].replace("[","").replace("]","").strip() active_group_name = line.split(" #")[0].replace("[","").replace("]","").strip()
if line.find(":vars") != -1 or line.find(":children") != -1: if line.find(":vars") != -1 or line.find(":children") != -1:
active_group_name = active_group_name.rsplit(":", 1)[0] active_group_name = active_group_name.rsplit(":", 1)[0]

6
test/TestInventory.py
View file

@ -294,6 +294,12 @@ class TestInventory(unittest.TestCase):
expected_hosts=['host1A','host2A','host1B','host2B'] expected_hosts=['host1A','host2A','host1B','host2B']
assert sorted(hosts) == sorted(expected_hosts) assert sorted(hosts) == sorted(expected_hosts)
def test_leading_range(self):
i = Inventory(os.path.join(self.test_dir, 'inventory','test_leading_range'))
hosts = i.list_hosts('test')
expected_hosts=['1.host','2.host','A.host','B.host']
assert sorted(hosts) == sorted(expected_hosts)
################################################### ###################################################
### Inventory API tests ### Inventory API tests

3
test/inventory/test_leading_range Normal file
View file

@ -0,0 +1,3 @@
[test]
[1:2].host
[A:B].host