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

Switch to using extra_vars for survey variables, fix up some unit tests

Browse Source 
related to that and some issues with system jobs
This commit is contained in:
Matthew Jones
2014-12-17 16:04:25 -05:00
parent 6e3cd5bc54
commit d4879506c2
5 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/api/views.py
View File

@@ -1486,13 +1486,14 @@ class JobTemplateLaunch(GenericAPIView):
request_data = {}
else:
request_data = request.DATA
validation_errors = obj.survey_variable_validation(request_data)
if validation_errors:
return Response(dict(errors=validation_errors),
status=status.HTTP_400_BAD_REQUEST)
if 'extra_vars' in request_data:
validation_errors = obj.survey_variable_validation(request_data['extra_vars'])
if validation_errors:
return Response(dict(errors=validation_errors),
status=status.HTTP_400_BAD_REQUEST)
if obj.credential is None and ('credential' not in request.DATA and 'credential_id' not in request.DATA):
return Response(dict(errors="Credential not provided"), status=status.HTTP_400_BAD_REQUEST)
new_job = obj.create_unified_job(**request.DATA)
new_job = obj.create_unified_job()
result = new_job.signal_start(**request.DATA)
if not result:
data = dict(passwords_needed_to_start=new_job.passwords_needed_to_start)
@@ -1773,7 +1774,8 @@ class SystemJobTemplateLaunch(GenericAPIView):
extra_vars = {}
else:
extra_vars = {}
result = new_job.signal_start(**extra_vars)
ev = {'extra_vars': extra_vars}
result = new_job.signal_start(**ev)
data = dict(system_job=new_job.id)
return Response(data, status=status.HTTP_202_ACCEPTED)