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

removed the need to access data in the serializer. It's now clear what params a job template launch takes

Browse Source
This commit is contained in:
Chris Meyers 2015-04-24 12:43:48 -04:00
parent 0d26a700a6
commit 299b0d78c8
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
awx/api/serializers.py
View File

@ -1695,7 +1695,6 @@ class JobLaunchSerializer(BaseSerializer):
passwords_needed_to_start = serializers.Field(source='passwords_needed_to_start')
can_start_without_user_input = serializers.Field(source='can_start_without_user_input')
variables_needed_to_start = serializers.Field(source='variables_needed_to_start')
credential_id = serializers.IntegerField(write_only=True, required=False)
credential_needed_to_start = serializers.SerializerMethodField('get_credential_needed_to_start')
survey_enabled = serializers.SerializerMethodField('get_survey_enabled')
@ -1703,7 +1702,7 @@ class JobLaunchSerializer(BaseSerializer):
model = JobTemplate
fields = ('can_start_without_user_input', 'passwords_needed_to_start', 'extra_vars',
'ask_variables_on_launch', 'survey_enabled', 'variables_needed_to_start',
'credential_id', 'credential', 'credential_needed_to_start',)
'credential', 'credential_needed_to_start',)
read_only_fields = ('ask_variables_on_launch',)
write_only_fields = ('credential','extra_vars',)
@ -1746,8 +1745,7 @@ class JobLaunchSerializer(BaseSerializer):
def validate(self, attrs):
obj = self.context.get('obj')
data = self.context.get('data')
sanitary_fields = ('credential', 'credential_id', 'extra_vars')
if not self.cred_valid(obj) and (attrs.get('credential', None) is None and attrs.get('credential_id', None) is None):
raise serializers.ValidationError(dict(errors=["Credential not provided"]))
if obj.job_type != PERM_INVENTORY_SCAN and (obj.project is None or not obj.project.active):
@ -1755,10 +1753,6 @@ class JobLaunchSerializer(BaseSerializer):
if obj.inventory is None or not obj.inventory.active:
raise serializers.ValidationError(dict(errors=["Job Template Inventory is missing or undefined"]))
data.clear()
for field in sanitary_fields:
if field in attrs:
data[field] = attrs[field]
return attrs
class ScheduleSerializer(BaseSerializer):

12
awx/api/views.py
View File

@ -1445,14 +1445,16 @@ class JobTemplateLaunch(RetrieveAPIView, GenericAPIView):
if not request.user.can_access(self.model, 'start', obj):
raise PermissionDenied()
# Note: is_valid() may modify request.DATA
# It will remove any key/value pair who's key is not credential, credential_id, or extra_vars
serializer = self.serializer_class(data=request.DATA, context={'obj': obj, 'data': request.DATA})
serializer = self.serializer_class(data=request.DATA, context={'obj': obj})
if not serializer.is_valid():
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
new_job = obj.create_unified_job(**request.DATA)
result = new_job.signal_start(**request.DATA)
kv = {
'credential': serializer.object.credential,
'extra_vars': serializer.object.extra_vars
}
new_job = obj.create_unified_job(**kv)
result = new_job.signal_start(**kv)
if not result:
data = dict(passwords_needed_to_start=new_job.passwords_needed_to_start)
new_job.delete()