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

Merge pull request #2577 from AlanCoding/fix_grandparents

Browse Source 
Fix bug where grandparent groups were excluded

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2018-11-02 14:36:48 +00:00 committed by GitHub
commit a338199198
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,7 +294,7 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
# Remove any empty groups
for group_name in list(data.keys()):
if not data.get(group_name, {}).get('hosts', []):
if not (data.get(group_name, {}).get('hosts', []) or data.get(group_name, {}).get('children', [])):
data.pop(group_name)
if hostvars:

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

@ -38,6 +38,28 @@ class TestInventoryScript:
'remote_tower_id': host.id
}
def test_grandparent_group(self, inventory):
g1 = inventory.groups.create(name='g1', variables={'v1': 'v1'})
g2 = inventory.groups.create(name='g2', variables={'v2': 'v2'})
h1 = inventory.hosts.create(name='h1')
# h1 becomes indirect member of g1 group
g1.children.add(g2)
g2.hosts.add(h1)
# make sure we return g1 details in output
data = inventory.get_script_data(hostvars=1)
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'}
}
def test_slice_subset(self, inventory):
for i in range(3):
inventory.hosts.create(name='host{}'.format(i))