External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-22 21:46:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

key prompting of all credentials off of ask_credential_on_launch

Browse Source 
see: #6371
This commit is contained in:
Ryan Petrello
2017-06-12 12:26:58 -04:00
parent 0e0bdccefb
commit d4afa41acb
7 changed files with 22 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tests/functional/api/test_job_runtime_params.py
View File

@@ -298,7 +298,7 @@ def test_job_launch_JT_with_validation(machine_credential, deploy_jobtemplate):
([999], 'object does not exist'),
])
def test_job_launch_JT_with_invalid_extra_credentials(machine_credential, deploy_jobtemplate, pks, error_msg):
deploy_jobtemplate.ask_extra_credentials_on_launch = True
deploy_jobtemplate.ask_credential_on_launch = True
deploy_jobtemplate.save()
kv = dict(extra_credentials=pks, credential=machine_credential.id)
@@ -337,7 +337,7 @@ def test_job_launch_JT_enforces_unique_extra_credential_kinds(machine_credential
@pytest.mark.django_db
def test_job_launch_JT_with_extra_credentials(machine_credential, credential, net_credential, deploy_jobtemplate):
deploy_jobtemplate.ask_extra_credentials_on_launch = True
deploy_jobtemplate.ask_credential_on_launch = True
deploy_jobtemplate.save()
kv = dict(extra_credentials=[credential.pk, net_credential.pk], credential=machine_credential.id)

20
awx/main/tests/functional/api/test_job_template.py
View File

@@ -479,7 +479,7 @@ def test_launch_with_extra_credentials(get, post, organization_factory,
objs = organization_factory("org", superusers=['admin'])
jt = job_template_factory("jt", organization=objs.organization,
inventory='test_inv', project='test_proj').job_template
jt.ask_extra_credentials_on_launch = True
jt.ask_credential_on_launch = True
jt.save()
resp = post(
@@ -500,13 +500,14 @@ def test_launch_with_extra_credentials(get, post, organization_factory,
@pytest.mark.django_db
def test_launch_with_extra_credentials_no_allowed(get, post, organization_factory,
job_template_factory, machine_credential,
credential, net_credential):
def test_launch_with_extra_credentials_not_allowed(get, post, organization_factory,
job_template_factory, machine_credential,
credential, net_credential):
objs = organization_factory("org", superusers=['admin'])
jt = job_template_factory("jt", organization=objs.organization,
inventory='test_inv', project='test_proj').job_template
jt.ask_extra_credentials_on_launch = False
jt.credential = machine_credential
jt.ask_credential_on_launch = False
jt.save()
resp = post(
@@ -515,8 +516,9 @@ def test_launch_with_extra_credentials_no_allowed(get, post, organization_factor
credential=machine_credential.pk,
extra_credentials=[credential.pk, net_credential.pk]
),
objs.superusers.admin, expect=201
objs.superusers.admin
)
assert 'credential' in resp.data['ignored_fields'].keys()
assert 'extra_credentials' in resp.data['ignored_fields'].keys()
job_pk = resp.data.get('id')
@@ -531,7 +533,7 @@ def test_launch_with_extra_credentials_from_jt(get, post, organization_factory,
objs = organization_factory("org", superusers=['admin'])
jt = job_template_factory("jt", organization=objs.organization,
inventory='test_inv', project='test_proj').job_template
jt.ask_extra_credentials_on_launch = True
jt.ask_credential_on_launch = True
jt.extra_credentials.add(credential)
jt.extra_credentials.add(net_credential)
jt.save()
@@ -559,7 +561,7 @@ def test_launch_with_empty_extra_credentials(get, post, organization_factory,
objs = organization_factory("org", superusers=['admin'])
jt = job_template_factory("jt", organization=objs.organization,
inventory='test_inv', project='test_proj').job_template
jt.ask_extra_credentials_on_launch = True
jt.ask_credential_on_launch = True
jt.extra_credentials.add(credential)
jt.extra_credentials.add(net_credential)
jt.save()
@@ -590,7 +592,7 @@ def test_v1_launch_with_extra_credentials(get, post, organization_factory,
objs = organization_factory("org", superusers=['admin'])
jt = job_template_factory("jt", organization=objs.organization,
inventory='test_inv', project='test_proj').job_template
jt.ask_extra_credentials_on_launch = True
jt.ask_credential_on_launch = True
jt.save()
resp = post(