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

update to fix missing options and fix pep8

Browse Source
This commit is contained in:
sean-m-sullivan
2020-10-19 15:15:33 -05:00
parent 4151361420
commit e416b55b1a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,9 +147,11 @@ def main():
argument_spec = dict( argument_spec = dict(
user=dict(), user=dict(),
team=dict(), team=dict(),
role=dict(choices=["admin", "read", "member", "execute", "adhoc", "update", "use", "approval", "auditor", "project_admin", "inventory_admin", "credential_admin", role=dict(choices=["admin", "read", "member", "execute", "adhoc", "update", "use", "approval",
"auditor", "project_admin", "inventory_admin", "credential_admin",
"workflow_admin", "notification_admin", "job_template_admin"], required=True), "workflow_admin", "notification_admin", "job_template_admin"], required=True),
target_team=dict(), target_team=dict(),
target_teams=dict(type='list', elements='str'),
inventory=dict(), inventory=dict(),
inventories=dict(type='list', elements='str'), inventories=dict(type='list', elements='str'),
job_template=dict(), job_template=dict(),
@@ -159,6 +161,7 @@ def main():
credential=dict(), credential=dict(),
credentials=dict(type='list', elements='str'), credentials=dict(type='list', elements='str'),
organization=dict(), organization=dict(),
organizations=dict(type='list', elements='str'),
lookup_organization=dict(), lookup_organization=dict(),
project=dict(), project=dict(),
projects=dict(type='list', elements='str'), projects=dict(type='list', elements='str'),
@@ -178,7 +181,6 @@ def main():
'credentials': 'credential', 'credentials': 'credential',
'inventories': 'inventory', 'inventories': 'inventory',
'job_templates': 'job_template', 'job_templates': 'job_template',
'target_teams': 'target_team',
'organizations': 'organization', 'organizations': 'organization',
'projects': 'project', 'projects': 'project',
'target_teams': 'target_team', 'target_teams': 'target_team',

3
awx_collection/test/awx/test_role.py
View File

@@ -48,6 +48,7 @@ def test_grant_workflow_permission(run_module, admin_user, organization, state):
else: else:
assert rando not in wfjt.execute_role assert rando not in wfjt.execute_role
@pytest.mark.django_db @pytest.mark.django_db
@pytest.mark.parametrize('state', ('present', 'absent')) @pytest.mark.parametrize('state', ('present', 'absent'))
def test_grant_workflow_list_permission(run_module, admin_user, organization, state): def test_grant_workflow_list_permission(run_module, admin_user, organization, state):
@@ -70,6 +71,7 @@ def test_grant_workflow_list_permission(run_module, admin_user, organization, st
else: else:
assert rando not in wfjt.execute_role assert rando not in wfjt.execute_role
@pytest.mark.django_db @pytest.mark.django_db
@pytest.mark.parametrize('state', ('present', 'absent')) @pytest.mark.parametrize('state', ('present', 'absent'))
def test_grant_workflow_approval_permission(run_module, admin_user, organization, state): def test_grant_workflow_approval_permission(run_module, admin_user, organization, state):
@@ -91,6 +93,7 @@ def test_grant_workflow_approval_permission(run_module, admin_user, organization
else: else:
assert rando not in wfjt.approval_role assert rando not in wfjt.approval_role
@pytest.mark.django_db @pytest.mark.django_db
def test_invalid_role(run_module, admin_user, project): def test_invalid_role(run_module, admin_user, project):
rando = User.objects.create(username='rando') rando = User.objects.create(username='rando')