External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-18 05:01:19 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3232 from AlanCoding/truly_empty_groups

Browse Source 
Surface empty groups as children of all group

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-03-26 19:17:36 +00:00 committed by GitHub
commit 23185ca22f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
awx/main/models/inventory.py
View File

@ -296,23 +296,27 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
group_children = group_children_map.setdefault(to_group_id, [])
group_children.append(from_group_name)
# Now use in-memory maps to build up group info.
for group in self.groups.only('name', 'id', 'variables'):
group_info = dict()
group_info['hosts'] = group_hosts_map.get(group.id, [])
group_info['children'] = group_children_map.get(group.id, [])
group_info['vars'] = group.variables_dict
data[group.name] = group_info
# Add ungrouped hosts to all group
all_group['hosts'] = [host.name for host in hosts if host.name not in grouped_hosts]
# Remove any empty groups
for group_name in list(data.keys()):
if group_name == 'all':
continue
if not (data.get(group_name, {}).get('hosts', []) or data.get(group_name, {}).get('children', [])):
data.pop(group_name)
# Now use in-memory maps to build up group info.
all_group_names = []
for group in self.groups.only('name', 'id', 'variables'):
group_info = dict()
if group.id in group_hosts_map:
group_info['hosts'] = group_hosts_map[group.id]
if group.id in group_children_map:
group_info['children'] = group_children_map[group.id]
group_vars = group.variables_dict
if group_vars:
group_info['vars'] = group_vars
if group_info:
data[group.name] = group_info
all_group_names.append(group.name)
# add all groups as children of all group, includes empty groups
if all_group_names:
all_group['children'] = all_group_names
if hostvars:
data.setdefault('_meta', dict())

25
awx/main/tests/functional/models/test_inventory.py
View File

@ -48,13 +48,28 @@ class TestInventoryScript:
data = inventory.get_script_data()
assert 'all' in data
assert data['all'] == {
'hosts': [],
'children': [],
'vars': {
'a1': 'a1'
}
}
def test_empty_group(self, inventory):
inventory.groups.create(name='ghost')
data = inventory.get_script_data()
# canonical behavior same as ansible-inventory
# group not provided top-level to avoid host / group confusion
# still list group as a child of the all group
assert 'ghost' not in data
assert 'ghost' in data['all']['children']
def test_empty_group_with_vars(self, inventory):
inventory.groups.create(name='ghost2', variables={'foo': 'bar'})
data = inventory.get_script_data()
# must be top-level key so group vars can be provided
assert 'ghost2' in data
assert data['ghost2']['vars'] == {'foo': 'bar'}
assert 'ghost2' in data['all']['children']
def test_grandparent_group(self, inventory):
g1 = inventory.groups.create(name='g1', variables={'v1': 'v1'})
g2 = inventory.groups.create(name='g2', variables={'v2': 'v2'})
@ -67,13 +82,11 @@ class TestInventoryScript:
assert 'g1' in data
assert 'g2' in data
assert data['g1'] == {
'hosts': [],
'children': ['g2'],
'vars': {'v1': 'v1'}
}
assert data['g2'] == {
'hosts': ['h1'],
'children': [],
'vars': {'v2': 'v2'}
}
@ -98,10 +111,10 @@ class TestInventoryScript:
g2.hosts.add(host)
for i in range(3):
expected_data = {
'contains_all_hosts': {'hosts': ['host{}'.format(i)], 'children': [], 'vars': {}},
'contains_all_hosts': {'hosts': ['host{}'.format(i)]},
}
if i < 2:
expected_data['contains_two_hosts'] = {'hosts': ['host{}'.format(i)], 'children': [], 'vars': {}}
expected_data['contains_two_hosts'] = {'hosts': ['host{}'.format(i)]}
data = inventory.get_script_data(slice_number=i + 1, slice_count=3)
data.pop('all')
assert data == expected_data