External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 23:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix to return hosts without a group in the 'all' group from inventory script view.

Browse Source
This commit is contained in:
Chris Church
2014-07-18 13:28:18 -04:00
parent e35a530dbb
commit 48afe188b2
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/api/views.py
View File

@@ -1070,8 +1070,15 @@ class InventoryScriptView(RetrieveAPIView):
else: else:
data = SortedDict() data = SortedDict()
if self.object.variables_dict: if self.object.variables_dict:
data['all'] = SortedDict() all_group = data.setdefault('all', SortedDict())
data['all']['vars'] = self.object.variables_dict all_group['vars'] = self.object.variables_dict
# Add hosts without a group to the all group.
groupless_hosts_qs = self.object.hosts.filter(groups__isnull=True, **hosts_q).order_by('name')
groupless_hosts = list(groupless_hosts_qs.values_list('name', flat=True))
if groupless_hosts:
all_group = data.setdefault('all', SortedDict())
all_group['hosts'] = groupless_hosts
# Build in-memory mapping of groups and their hosts. # Build in-memory mapping of groups and their hosts.
group_hosts_kw = dict(group__inventory_id=self.object.id, group__active=True, group_hosts_kw = dict(group__inventory_id=self.object.id, group__active=True,
@@ -1120,8 +1127,10 @@ class InventoryScriptView(RetrieveAPIView):
**hosts_q) **hosts_q)
localhosts = list(localhosts_qs.values_list('name', flat=True)) localhosts = list(localhosts_qs.values_list('name', flat=True))
if localhosts: if localhosts:
data.setdefault('all', SortedDict()) all_group = data.setdefault('all', SortedDict())
data['all']['hosts'] = localhosts all_group_hosts = all_group.get('hosts', [])
all_group_hosts.extend(localhosts)
all_group['hosts'] = sorted(set(all_group_hosts))
return Response(data) return Response(data)

11
awx/main/tests/inventory.py
View File

@@ -797,13 +797,16 @@ class InventoryTest(BaseTest):
h_c.groups.add(g_c) h_c.groups.add(g_c)
h_d = i_a.hosts.create(name='d', variables=json.dumps({'d-vars': 'ddd'})) h_d = i_a.hosts.create(name='d', variables=json.dumps({'d-vars': 'ddd'}))
h_d.groups.add(g_d) h_d.groups.add(g_d)
# Add another host not in any groups.
h_z = i_a.hosts.create(name='z', variables=json.dumps({'z-vars': 'zzz'}))
# Old, slow 1.2 way. # Old, slow 1.2 way.
url = reverse('api:inventory_script_view', args=(i_a.pk,)) url = reverse('api:inventory_script_view', args=(i_a.pk,))
with self.current_user(self.super_django_user): with self.current_user(self.super_django_user):
response = self.get(url, expect=200) response = self.get(url, expect=200)
self.assertTrue('all' in response) self.assertTrue('all' in response)
self.assertEqual(response['all']['vars'], i_a.variables_dict) self.assertEqual(response['all']['vars'], i_a.variables_dict)
self.assertEqual(response['all']['hosts'], ['z'])
for g in i_a.groups.all(): for g in i_a.groups.all():
self.assertTrue(g.name in response) self.assertTrue(g.name in response)
self.assertEqual(response[g.name]['vars'], g.variables_dict) self.assertEqual(response[g.name]['vars'], g.variables_dict)
@@ -818,11 +821,17 @@ class InventoryTest(BaseTest):
response = self.get(h_url, expect=200) response = self.get(h_url, expect=200)
self.assertEqual(response, h.variables_dict) self.assertEqual(response, h.variables_dict)
# Now add localhost to the inventory.
h_l = i_a.hosts.create(name='localhost', variables=json.dumps({'ansible_connection': 'local'}))
# New 1.3 way. # New 1.3 way.
url = reverse('api:inventory_script_view', args=(i_a.pk,)) url = reverse('api:inventory_script_view', args=(i_a.pk,))
url = '%s?hostvars=1' % url url = '%s?hostvars=1' % url
with self.current_user(self.super_django_user): with self.current_user(self.super_django_user):
response = self.get(url, expect=200) response = self.get(url, expect=200)
self.assertTrue('all' in response)
self.assertEqual(response['all']['vars'], i_a.variables_dict)
self.assertEqual(response['all']['hosts'], ['localhost', 'z'])
self.assertTrue('_meta' in response) self.assertTrue('_meta' in response)
self.assertTrue('hostvars' in response['_meta']) self.assertTrue('hostvars' in response['_meta'])
for h in i_a.hosts.all(): for h in i_a.hosts.all():