zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-10 10:01:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Integrate Ansible core tower modules content into AWX

Browse Source 
This commit includes all the changes involved in
converting the old Ansible Tower modules from commits
in Ansible core into the AWX collection that replaces it.
Also includes work needed to integrate it into the
AWX processes like tests, docs, and the Makefile.

Apply changes from content_collector tool

Add integrated module tests
  operate via run_module fixture
  add makefile target for them

Add flake8 target and fix flake8 errors

Update README

Make consolidated target for testing modules
This commit is contained in:
AlanCoding
2019-08-30 17:11:01 -04:00
parent 5271c993ac
commit 2f0f692f4a
32 changed files with 333 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx_modules/plugins/modules/tower_credential.py
View File

@@ -190,7 +190,7 @@ EXAMPLES = '''
import os
from ansible.module_utils._text import to_text
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

2
awx_modules/plugins/modules/tower_credential_type.py
View File

@@ -87,7 +87,7 @@ EXAMPLES = '''
RETURN = ''' # '''
from ansible.module_utils.ansible_tower import (
from ..module_utils.ansible_tower import (
TowerModule,
tower_auth_config,
tower_check_mode

2
awx_modules/plugins/modules/tower_group.py
View File

@@ -93,7 +93,7 @@ EXAMPLES = '''
import os
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

2
awx_modules/plugins/modules/tower_host.py
View File

@@ -66,7 +66,7 @@ EXAMPLES = '''
import os
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode, HAS_TOWER_CLI
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

2
awx_modules/plugins/modules/tower_inventory.py
View File

@@ -67,7 +67,7 @@ EXAMPLES = '''
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

2
awx_modules/plugins/modules/tower_inventory_source.py
View File

@@ -166,7 +166,7 @@ EXAMPLES = '''
RETURN = ''' # '''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

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

@@ -55,7 +55,7 @@ status:
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

2
awx_modules/plugins/modules/tower_job_launch.py
View File

@@ -96,7 +96,7 @@ status:
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

2
awx_modules/plugins/modules/tower_job_list.py
View File

@@ -78,7 +78,7 @@ results:
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

2
awx_modules/plugins/modules/tower_job_template.py
View File

@@ -199,7 +199,7 @@ EXAMPLES = '''
survey_spec: "{{ lookup('file', 'my_survey.json') }}"
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

4
awx_modules/plugins/modules/tower_job_wait.py
View File

@@ -82,7 +82,7 @@ status:
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ansible.module_utils.six.moves import cStringIO as StringIO
@@ -125,7 +125,7 @@ def main():
job_id = params.get('job_id')
try:
result = job.monitor(job_id, **params)
except exc.Timeout as excinfo:
except exc.Timeout:
result = job.status(job_id)
result['id'] = job_id
json_output['msg'] = 'Timeout waiting for job to finish.'

2
awx_modules/plugins/modules/tower_label.py
View File

@@ -49,7 +49,7 @@ EXAMPLES = '''
tower_config_file: "~/tower_cli.cfg"
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

2
awx_modules/plugins/modules/tower_notification.py
View File

@@ -268,7 +268,7 @@ EXAMPLES = '''
RETURN = ''' # '''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

2
awx_modules/plugins/modules/tower_organization.py
View File

@@ -48,7 +48,7 @@ EXAMPLES = '''
tower_config_file: "~/tower_cli.cfg"
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

8
awx_modules/plugins/modules/tower_project.py
View File

@@ -110,7 +110,7 @@ EXAMPLES = '''
tower_config_file: "~/tower_cli.cfg"
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli
@@ -171,7 +171,7 @@ def main():
try:
org_res = tower_cli.get_resource('organization')
org = org_res.get(name=organization)
except (exc.NotFound) as excinfo:
except exc.NotFound:
module.fail_json(msg='Failed to update project, organization not found: {0}'.format(organization), changed=False)
if scm_credential:
@@ -179,11 +179,11 @@ def main():
cred_res = tower_cli.get_resource('credential')
try:
cred = cred_res.get(name=scm_credential)
except (tower_cli.exceptions.MultipleResults) as multi_res_excinfo:
except tower_cli.exceptions.MultipleResults:
module.warn('Multiple credentials found for {0}, falling back looking in project organization'.format(scm_credential))
cred = cred_res.get(name=scm_credential, organization=org['id'])
scm_credential = cred['id']
except (exc.NotFound) as excinfo:
except exc.NotFound:
module.fail_json(msg='Failed to update project, credential not found: {0}'.format(scm_credential), changed=False)
if (scm_update_cache_timeout is not None) and (scm_update_on_launch is not True):

2
awx_modules/plugins/modules/tower_receive.py
View File

@@ -109,7 +109,7 @@ assets:
sample: [ {}, {} ]
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, HAS_TOWER_CLI
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, HAS_TOWER_CLI
try:
from tower_cli.cli.transfer.receive import Receiver

2
awx_modules/plugins/modules/tower_role.py
View File

@@ -72,7 +72,7 @@ EXAMPLES = '''
tower_config_file: "~/tower_cli.cfg"
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

4
awx_modules/plugins/modules/tower_send.py
View File

@@ -76,7 +76,7 @@ import os
import sys
from ansible.module_utils.six.moves import StringIO
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, HAS_TOWER_CLI
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, HAS_TOWER_CLI
from tempfile import mkstemp
@@ -138,7 +138,7 @@ def main():
sys.stdout = captured_stdout = StringIO()
try:
sender.send(files, prevent, password_management)
except TypeError as e:
except TypeError:
# Newer versions of TowerCLI require 4 parameters
sender.send(files, prevent, [], password_management)

2
awx_modules/plugins/modules/tower_settings.py
View File

@@ -56,7 +56,7 @@ EXAMPLES = '''
no_log: true
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

2
awx_modules/plugins/modules/tower_team.py
View File

@@ -50,7 +50,7 @@ EXAMPLES = '''
tower_config_file: "~/tower_cli.cfg"
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

2
awx_modules/plugins/modules/tower_user.py
View File

@@ -100,7 +100,7 @@ EXAMPLES = '''
tower_config_file: "~/tower_cli.cfg"
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
from ..module_utils.ansible_tower import TowerModule, tower_auth_config, tower_check_mode
try:
import tower_cli

2
awx_modules/plugins/modules/tower_workflow_launch.py
View File

@@ -75,7 +75,7 @@ EXAMPLES = '''
register: workflow_task_info
'''
from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config
from ..module_utils.ansible_tower import TowerModule, tower_auth_config
try:
import tower_cli

3
awx_modules/plugins/modules/tower_workflow_template.py
View File

@@ -93,8 +93,7 @@ EXAMPLES = '''
RETURN = ''' # '''
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ansible_tower import (
from ..module_utils.ansible_tower import (
TowerModule,
tower_auth_config,
tower_check_mode