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

get_one now also returns the name field, and modifying modules for get_one and added in some IDs in a handful of unit tests

Browse Source
This commit is contained in:
John Westcott IV
2020-09-04 15:41:36 -04:00
parent 4c4d6dad49
commit 106157c600
34 changed files with 83 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx_collection/plugins/modules/tower_credential.py
View File

@@ -370,9 +370,7 @@ def main():
if organization:
lookup_data['organization'] = org_id
credential = module.get_one('credentials', name_or_id=name, **{'data': lookup_data})
# If we got an item back make sure the name field reflects the actual name (incase we were passed an ID)
name = credential['name'] if (credential) else name
credential, name = module.get_one('credentials', name_or_id=name, **{'data': lookup_data})
if state == 'absent':
# If the state was absent we can let the module delete it if needed, the module will handle exiting from this

2
awx_collection/plugins/modules/tower_credential_input_source.py
View File

@@ -102,7 +102,7 @@ def main():
'target_credential': target_credential_id,
'input_field_name': input_field_name,
}
credential_input_source = module.get_one('credential_input_sources', **{'data': lookup_data})
credential_input_source, junk = module.get_one('credential_input_sources', **{'data': lookup_data})
if state == 'absent':
module.delete_if_needed(credential_input_source)

6
awx_collection/plugins/modules/tower_credential_type.py
View File

@@ -128,11 +128,7 @@ def main():
credential_type_params['injectors'] = module.params.get('injectors')
# Attempt to look up credential_type based on the provided name
credential_type = module.get_one('credential_types', **{
'data': {
'name': name,
}
})
credential_type, name = module.get_one('credential_types', name_or_id=name)
if state == 'absent':
# If the state was absent we can let the module delete it if needed, the module will handle exiting from this

7
awx_collection/plugins/modules/tower_group.py
View File

@@ -108,9 +108,8 @@ def main():
inventory_id = module.resolve_name_to_id('inventories', inventory)
# Attempt to look up the object based on the provided name and inventory ID
group = module.get_one('groups', **{
group, name = module.get_one('groups', name_or_id=name, **{
'data': {
'name': name,
'inventory': inventory_id
}
})
@@ -136,8 +135,8 @@ def main():
continue
id_list = []
for sub_name in name_list:
sub_obj = module.get_one(resource, **{
'data': {'inventory': inventory_id, 'name': sub_name}
sub_obj, sub_name = module.get_one(resource, name_or_id=sub_name, **{
'data': {'inventory': inventory_id},
})
if sub_obj is None:
module.fail_json(msg='Could not find {0} with name {1}'.format(resource, sub_name))

3
awx_collection/plugins/modules/tower_host.py
View File

@@ -104,9 +104,8 @@ def main():
inventory_id = module.resolve_name_to_id('inventories', inventory)
# Attempt to look up host based on the provided name and inventory ID
host = module.get_one('hosts', **{
host, name = module.get_one('hosts', name_or_id=name, **{
'data': {
'name': name,
'inventory': inventory_id
}
})

6
awx_collection/plugins/modules/tower_instance_group.py
View File

@@ -109,11 +109,7 @@ def main():
state = module.params.get('state')
# Attempt to look up an existing item based on the provided data
existing_item = module.get_one('instance_groups', **{
'data': {
'name': name,
}
})
existing_item, name = module.get_one('instance_groups', name_or_id=name)
if state is 'absent':
# If the state was absent we can let the module delete it if needed, the module will handle exiting from this

3
awx_collection/plugins/modules/tower_inventory.py
View File

@@ -109,9 +109,8 @@ def main():
org_id = module.resolve_name_to_id('organizations', organization)
# Attempt to look up inventory based on the provided name and org ID
inventory = module.get_one('inventories', **{
inventory, name = module.get_one('inventories', name_or_id=name, **{
'data': {
'name': name,
'organization': org_id
}
})

8
awx_collection/plugins/modules/tower_inventory_source.py
View File

@@ -202,17 +202,17 @@ def main():
source_project = module.params.get('source_project')
state = module.params.get('state')
lookup_data = {'name': inventory}
<<<<<<< HEAD
lookup_data = {}
if organization:
lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
inventory_object = module.get_one('inventories', data=lookup_data)
inventory_object = module.get_one('inventories', name_or_id=inventory, data=lookup_data)
if not inventory_object:
module.fail_json(msg='The specified inventory, {0}, was not found.'.format(lookup_data))
inventory_source_object = module.get_one('inventory_sources', **{
inventory_source_object = module.get_one('inventory_sources', name_or_id=name, **{
'data': {
'name': name,
'inventory': inventory_object['id'],
}
})

2
awx_collection/plugins/modules/tower_job_cancel.py
View File

@@ -68,7 +68,7 @@ def main():
fail_if_not_running = module.params.get('fail_if_not_running')
# Attempt to look up the job based on the provided name
job = module.get_one('jobs', **{
job, job_name = module.get_one('jobs', **{
'data': {
'id': job_id,
}

6
awx_collection/plugins/modules/tower_job_launch.py
View File

@@ -201,11 +201,7 @@ def main():
post_data['credentials'].append(module.resolve_name_to_id('credentials', credential))
# Attempt to look up job_template based on the provided name
job_template = module.get_one('job_templates', **{
'data': {
'name': name,
}
})
job_template, name = module.get_one('job_templates', name_or_id=name)
if job_template is None:
module.fail_json(msg="Unable to find job template by name {0}".format(name))

7
awx_collection/plugins/modules/tower_job_template.py
View File

@@ -409,7 +409,7 @@ def main():
credentials.append(credential)
new_fields = {}
search_fields = {'name': name}
search_fields = {}
# Attempt to look up the related items the user specified (these will fail the module if not found)
organization_id = None
@@ -419,7 +419,7 @@ def main():
search_fields['organization'] = new_fields['organization'] = organization_id
# Attempt to look up an existing item based on the provided data
existing_item = module.get_one('job_templates', **{'data': search_fields})
existing_item, name = module.get_one('job_templates', name_or_id=name, **{'data': search_fields})
if state == 'absent':
# If the state was absent we can let the module delete it if needed, the module will handle exiting from this
@@ -453,9 +453,8 @@ def main():
new_fields['inventory'] = module.resolve_name_to_id('inventories', inventory)
if project is not None:
if organization_id is not None:
project_data = module.get_one('projects', **{
project_data, project = module.get_one('projects', name_or_id=project, **{
'data': {
'name': project,
'organization': organization_id,
}
})

2
awx_collection/plugins/modules/tower_job_wait.py
View File

@@ -130,7 +130,7 @@ def main():
)
# Attempt to look up job based on the provided id
job = module.get_one('jobs', **{
job, junk = module.get_one('jobs', **{
'data': {
'id': job_id,
}

3
awx_collection/plugins/modules/tower_label.py
View File

@@ -80,9 +80,8 @@ def main():
organization_id = module.resolve_name_to_id('organizations', organization)
# Attempt to look up an existing item based on the provided data
existing_item = module.get_one('labels', **{
existing_item, name = module.get_one('labels', name_or_id=name, **{
'data': {
'name': name,
'organization': organization_id,
}
})

3
awx_collection/plugins/modules/tower_notification_template.py
View File

@@ -380,9 +380,8 @@ def main():
organization_id = module.resolve_name_to_id('organizations', organization)
# Attempt to look up an existing item based on the provided data
existing_item = module.get_one('notification_templates', **{
existing_item, name = module.get_one('notification_templates', name_or_id=name, **{
'data': {
'name': name,
'organization': organization_id,
}
})

6
awx_collection/plugins/modules/tower_organization.py
View File

@@ -117,11 +117,7 @@ def main():
state = module.params.get('state')
# Attempt to look up organization based on the provided name
organization = module.get_one('organizations', **{
'data': {
'name': name,
}
})
organization, name = module.get_one('organizations', name_or_id=name)
if state == 'absent':
# If the state was absent we can let the module delete it if needed, the module will handle exiting from this

3
awx_collection/plugins/modules/tower_project.py
View File

@@ -239,9 +239,8 @@ def main():
credential = module.resolve_name_to_id('credentials', credential)
# Attempt to look up project based on the provided name and org ID
project = module.get_one('projects', **{
project, name = module.get_one('projects', name_or_id=name, **{
'data': {
'name': name,
'organization': org_id
}
})

4
awx_collection/plugins/modules/tower_project_update.py
View File

@@ -109,10 +109,10 @@ def main():
module.fail_json(msg='Could not find Project with ID: {0}'.format(name))
project = results['json']['results'][0]
else:
lookup_data = {'name': name}
lookup_data = {}
if organization:
lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
project = module.get_one('projects', data=lookup_data)
project, name = module.get_one('projects', name_or_id=name, data=lookup_data)
if project is None:
module.fail_json(msg="Unable to find project")

6
awx_collection/plugins/modules/tower_schedule.py
View File

@@ -190,11 +190,7 @@ def main():
unified_job_template_id = module.resolve_name_to_id('unified_job_templates', unified_job_template)
# Attempt to look up an existing item based on the provided data
existing_item = module.get_one('schedules', **{
'data': {
'name': name,
}
})
existing_item, name = module.get_one('schedules', name_or_id=name)
# Create the data that gets sent for create and update
new_fields = {}

3
awx_collection/plugins/modules/tower_team.py
View File

@@ -87,9 +87,8 @@ def main():
org_id = module.resolve_name_to_id('organizations', organization)
# Attempt to look up team based on the provided name and org ID
team = module.get_one('teams', **{
team, name = module.get_one('teams', name_or_id=name, **{
'data': {
'name': name,
'organization': org_id
}
})

2
awx_collection/plugins/modules/tower_token.py
View File

@@ -164,7 +164,7 @@ def main():
if state == 'absent':
if not existing_token:
existing_token = module.get_one('tokens', **{
existing_token, token_name = module.get_one('tokens', **{
'data': {
'id': existing_token_id,
}

4
awx_collection/plugins/modules/tower_user.py
View File

@@ -134,9 +134,7 @@ def main():
# Attempt to look up the related items the user specified (these will fail the module if not found)
# Attempt to look up an existing item based on the provided data
existing_item = module.get_one('users', name_or_id=username)
# If we got an item back make sure the name field reflects the actual name (incase we were passed an ID)
username = existing_item['username'] if (existing_item) else username
existing_item, username = module.get_one('users', name_or_id=username)
if state == 'absent':
# If the state was absent we can let the module delete it if needed, the module will handle exiting from this

4
awx_collection/plugins/modules/tower_workflow_job_template.py
View File

@@ -184,7 +184,7 @@ def main():
state = module.params.get('state')
new_fields = {}
search_fields = {'name': name}
search_fields = {}
# Attempt to look up the related items the user specified (these will fail the module if not found)
organization = module.params.get('organization')
@@ -193,7 +193,7 @@ def main():
search_fields['organization'] = new_fields['organization'] = organization_id
# Attempt to look up an existing item based on the provided data
existing_item = module.get_one('workflow_job_templates', **{'data': search_fields})
existing_item, name = module.get_one('workflow_job_templates', name_or_id=name, **{'data': search_fields})
if state == 'absent':
# If the state was absent we can let the module delete it if needed, the module will handle exiting from this

10
awx_collection/plugins/modules/tower_workflow_job_template_node.py
View File

@@ -198,12 +198,14 @@ def main():
workflow_job_template = module.params.get('workflow_job_template')
workflow_job_template_id = None
if workflow_job_template:
wfjt_search_fields = {'name': workflow_job_template}
wfjt_search_fields = {}
organization = module.params.get('organization')
if organization:
organization_id = module.resolve_name_to_id('organizations', organization)
wfjt_search_fields['organization'] = organization_id
wfjt_data = module.get_one('workflow_job_templates', **{'data': wfjt_search_fields})
wfjt_data, workflow_job_template = module.get_one('workflow_job_templates', name_or_id=workflow_job_template, **{
'data': wfjt_search_fields
})
if wfjt_data is None:
module.fail_json(msg="The workflow {0} in organization {1} was not found on the Tower server".format(
workflow_job_template, organization
@@ -212,7 +214,7 @@ def main():
search_fields['workflow_job_template'] = new_fields['workflow_job_template'] = workflow_job_template_id
# Attempt to look up an existing item based on the provided data
existing_item = module.get_one('workflow_job_template_nodes', **{'data': search_fields})
existing_item, junk = module.get_one('workflow_job_template_nodes', **{'data': search_fields})
if state == 'absent':
# If the state was absent we can let the module delete it if needed, the module will handle exiting from this
@@ -249,7 +251,7 @@ def main():
lookup_data = {'identifier': sub_name}
if workflow_job_template_id:
lookup_data['workflow_job_template'] = workflow_job_template_id
sub_obj = module.get_one(endpoint, **{'data': lookup_data})
sub_obj, junk = module.get_one(endpoint, **{'data': lookup_data})
if sub_obj is None:
module.fail_json(msg='Could not find {0} entry with name {1}'.format(association, sub_name))
id_list.append(sub_obj['id'])

4
awx_collection/plugins/modules/tower_workflow_launch.py
View File

@@ -138,10 +138,10 @@ def main():
post_data['inventory'] = module.resolve_name_to_id('inventories', inventory)
# Attempt to look up job_template based on the provided name
lookup_data = {'name': name}
lookup_data = {}
if organization:
lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
workflow_job_template = module.get_one('workflow_job_templates', data=lookup_data)
workflow_job_template, name = module.get_one('workflow_job_templates', name_or_id=name, data=lookup_data)
if workflow_job_template is None:
module.fail_json(msg="Unable to find workflow job template")