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

Merge pull request #1283 from jhoekx/fix-inventory-api-groups

Browse source 
Fix inventory API groups
This commit is contained in:
Michael DeHaan 2012-10-10 09:51:36 -07:00
commit ae94b050af
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/inventory/script.py
View file

@ -35,6 +35,7 @@ class InventoryScript(object):
self.groups = self._parse()
def _parse(self):
all_hosts = {}
groups = {}
self.raw = utils.parse_json(self.data)
@ -45,7 +46,9 @@ class InventoryScript(object):
group = groups[group_name] = Group(group_name)
host = None
for hostname in hosts:
host = Host(hostname)
if not hostname in all_hosts:
all_hosts[hostname] = Host(hostname)
host = all_hosts[hostname]
group.add_host(host)
# FIXME: hack shouldn't be needed
all.add_host(host)

10
test/TestInventory.py
View file

@ -246,3 +246,13 @@ class TestInventory(unittest.TestCase):
actual_hosts = inventory.get_hosts(host_names)
actual_host_names = [host.name for host in actual_hosts]
assert host_names == actual_host_names
def test_script_multiple_groups(self):
inventory = self.script_inventory()
vars = inventory.get_variables('zeus')
print "VARS=%s" % vars
assert vars == {'inventory_hostname': 'zeus',
'inventory_hostname_short': 'zeus',
'group_names': ['greek', 'major-god']}

8
test/inventory_api.py
View file

@ -13,15 +13,17 @@ parser.add_option('-e', '--extra-vars', default=None, dest="extra")
options, args = parser.parse_args()
systems = {
"ungouped": [ "jupiter", "saturn" ],
"ungrouped": [ "jupiter", "saturn" ],
"greek": [ "zeus", "hera", "poseidon" ],
"norse": [ "thor", "odin", "loki" ]
"norse": [ "thor", "odin", "loki" ],
"major-god": [ "zeus", "odin" ],
}
variables = {
"thor": {
"hammer": True
}
},
"zeus": {},
}
if options.list_hosts == True: