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

AC-1295 Allow host names to contain brackets when importing from JSON sources.

Browse Source
This commit is contained in:
Chris Church 2014-06-06 14:17:05 -04:00
parent 28c8a3822d
commit 24df1a88ee
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/management/commands/inventory_import.py
View File

@ -169,10 +169,9 @@ class BaseLoader(object):
def get_host(self, name):
'''
Return a MemHost instance from host name, creating if needed.
Return a MemHost instance from host name, creating if needed. If name
contains brackets, they will not be interpreted as a host pattern.
'''
if '[' in name or ']' in name:
raise ValueError('host ranges like %s are not supported by this importer' % name)
host_name = name.split(':')[0]
if self.host_filter_re and not self.host_filter_re.match(host_name):
logger.debug('Filtering host %s', host_name)

7
awx/main/tests/commands.py
View File

@ -775,8 +775,13 @@ class InventoryImportTest(BaseCommandMixin, BaseLiveServerTest):
self.assertTrue(isinstance(result, ValueError), result)
def test_executable_file(self):
# New empty inventory.
# Use existing inventory as source.
old_inv = self.inventories[1]
# Modify host name to contain brackets (AC-1295).
old_host = old_inv.hosts.all()[0]
old_host.name = '[hey look some brackets]'
old_host.save()
# New empty inventory.
new_inv = self.organizations[0].inventories.create(name='newb')
self.assertEqual(new_inv.hosts.count(), 0)
self.assertEqual(new_inv.groups.count(), 0)