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

moved passwords_needed_to_start to job options. have job launch inherit from jobtemplate and job options

Browse Source
This commit is contained in:
Chris Meyers
2015-04-30 12:42:24 -04:00
parent 4ecea7dc5b
commit a29868c551
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
awx/api/serializers.py
View File

@@ -1321,12 +1321,13 @@ class CredentialSerializer(BaseSerializer):
class JobOptionsSerializer(BaseSerializer): class JobOptionsSerializer(BaseSerializer):
passwords_needed_to_start = serializers.Field(source='passwords_needed_to_start')
class Meta: class Meta:
fields = ('*', 'job_type', 'inventory', 'project', 'playbook', fields = ('*', 'job_type', 'inventory', 'project', 'playbook',
'credential', 'cloud_credential', 'forks', 'limit', 'credential', 'cloud_credential', 'forks', 'limit',
'verbosity', 'extra_vars', 'job_tags', 'force_handlers', 'verbosity', 'extra_vars', 'job_tags', 'force_handlers',
'skip_tags', 'start_at_task') 'skip_tags', 'start_at_task', 'passwords_needed_to_start',)
def get_related(self, obj): def get_related(self, obj):
res = super(JobOptionsSerializer, self).get_related(obj) res = super(JobOptionsSerializer, self).get_related(obj)
@@ -1372,6 +1373,21 @@ class JobOptionsSerializer(BaseSerializer):
raise serializers.ValidationError('Must select playbook for project') raise serializers.ValidationError('Must select playbook for project')
return attrs return attrs
def validate_passwords_needed_to_start(self, attrs, source):
obj = self.context.get('obj')
passwords = self.context.get('passwords')
data = self.context.get('data')
credential = attrs.get('credential', None) or obj.credential
# fill passwords dict with request data passwords
if credential and credential.passwords_needed:
try:
for p in credential.passwords_needed:
passwords[p] = data[p]
except KeyError:
raise serializers.ValidationError(credential.passwords_needed)
return attrs
class JobTemplateSerializer(UnifiedJobTemplateSerializer, JobOptionsSerializer): class JobTemplateSerializer(UnifiedJobTemplateSerializer, JobOptionsSerializer):
@@ -1418,12 +1434,11 @@ class JobTemplateSerializer(UnifiedJobTemplateSerializer, JobOptionsSerializer):
class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer): class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
passwords_needed_to_start = serializers.Field(source='passwords_needed_to_start')
ask_variables_on_launch = serializers.Field(source='ask_variables_on_launch') ask_variables_on_launch = serializers.Field(source='ask_variables_on_launch')
class Meta: class Meta:
model = Job model = Job
fields = ('*', 'job_template', 'passwords_needed_to_start', 'ask_variables_on_launch') fields = ('*', 'job_template', 'ask_variables_on_launch')
def get_related(self, obj): def get_related(self, obj):
res = super(JobSerializer, self).get_related(obj) res = super(JobSerializer, self).get_related(obj)
@@ -1494,22 +1509,6 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
pass pass
return ret return ret
def validate_passwords_needed_to_start(self, attrs, source):
obj = self.context.get('obj')
passwords = self.context.get('passwords')
data = self.context.get('data')
credential = attrs.get('credential', None) or obj.credential
# fill passwords dict with request data passwords
if credential and credential.passwords_needed:
try:
for p in credential.passwords_needed:
passwords[p] = data[p]
except KeyError:
raise serializers.ValidationError(credential.passwords_needed)
return attrs
class JobCancelSerializer(JobSerializer): class JobCancelSerializer(JobSerializer):
can_cancel = serializers.BooleanField(source='can_cancel', read_only=True) can_cancel = serializers.BooleanField(source='can_cancel', read_only=True)
@@ -1518,7 +1517,7 @@ class JobCancelSerializer(JobSerializer):
fields = ('can_cancel',) fields = ('can_cancel',)
class JobLaunchSerializer(JobSerializer): class JobLaunchSerializer(JobTemplateSerializer, JobOptionsSerializer):
can_start_without_user_input = serializers.Field(source='can_start_without_user_input') can_start_without_user_input = serializers.Field(source='can_start_without_user_input')
variables_needed_to_start = serializers.Field(source='variables_needed_to_start') variables_needed_to_start = serializers.Field(source='variables_needed_to_start')
credential_needed_to_start = serializers.SerializerMethodField('get_credential_needed_to_start') credential_needed_to_start = serializers.SerializerMethodField('get_credential_needed_to_start')