mirror of
https://github.com/ansible/awx.git
synced 2026-01-09 15:02:07 -03:30
add serializer stuff so shows up in DRF
This commit is contained in:
parent
a2decc7c60
commit
d65ab1c5ac
@ -682,11 +682,12 @@ class EmptySerializer(serializers.Serializer):
|
|||||||
class UnifiedJobTemplateSerializer(BaseSerializer):
|
class UnifiedJobTemplateSerializer(BaseSerializer):
|
||||||
# As a base serializer, the capabilities prefetch is not used directly,
|
# As a base serializer, the capabilities prefetch is not used directly,
|
||||||
# instead they are derived from the Workflow Job Template Serializer and the Job Template Serializer, respectively.
|
# instead they are derived from the Workflow Job Template Serializer and the Job Template Serializer, respectively.
|
||||||
|
priority = serializers.IntegerField(required=False, min_value=0, max_value=32000)
|
||||||
capabilities_prefetch = []
|
capabilities_prefetch = []
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = UnifiedJobTemplate
|
model = UnifiedJobTemplate
|
||||||
fields = ('*', 'last_job_run', 'last_job_failed', 'next_job_run', 'status', 'execution_environment')
|
fields = ('*', 'last_job_run', 'last_job_failed', 'next_job_run', 'status', 'priority', 'execution_environment')
|
||||||
|
|
||||||
def get_related(self, obj):
|
def get_related(self, obj):
|
||||||
res = super(UnifiedJobTemplateSerializer, self).get_related(obj)
|
res = super(UnifiedJobTemplateSerializer, self).get_related(obj)
|
||||||
@ -2996,6 +2997,7 @@ class JobOptionsSerializer(LabelsListMixin, BaseSerializer):
|
|||||||
'scm_branch',
|
'scm_branch',
|
||||||
'forks',
|
'forks',
|
||||||
'limit',
|
'limit',
|
||||||
|
'priority',
|
||||||
'verbosity',
|
'verbosity',
|
||||||
'extra_vars',
|
'extra_vars',
|
||||||
'job_tags',
|
'job_tags',
|
||||||
@ -3118,6 +3120,7 @@ class JobTemplateMixin(object):
|
|||||||
class JobTemplateSerializer(JobTemplateMixin, UnifiedJobTemplateSerializer, JobOptionsSerializer):
|
class JobTemplateSerializer(JobTemplateMixin, UnifiedJobTemplateSerializer, JobOptionsSerializer):
|
||||||
show_capabilities = ['start', 'schedule', 'copy', 'edit', 'delete']
|
show_capabilities = ['start', 'schedule', 'copy', 'edit', 'delete']
|
||||||
capabilities_prefetch = ['admin', 'execute', {'copy': ['project.use', 'inventory.use']}]
|
capabilities_prefetch = ['admin', 'execute', {'copy': ['project.use', 'inventory.use']}]
|
||||||
|
priority = serializers.IntegerField(required=False, min_value=0, max_value=32000)
|
||||||
|
|
||||||
status = serializers.ChoiceField(choices=JobTemplate.JOB_TEMPLATE_STATUS_CHOICES, read_only=True, required=False)
|
status = serializers.ChoiceField(choices=JobTemplate.JOB_TEMPLATE_STATUS_CHOICES, read_only=True, required=False)
|
||||||
|
|
||||||
@ -3125,6 +3128,7 @@ class JobTemplateSerializer(JobTemplateMixin, UnifiedJobTemplateSerializer, JobO
|
|||||||
model = JobTemplate
|
model = JobTemplate
|
||||||
fields = (
|
fields = (
|
||||||
'*',
|
'*',
|
||||||
|
'priority',
|
||||||
'host_config_key',
|
'host_config_key',
|
||||||
'ask_scm_branch_on_launch',
|
'ask_scm_branch_on_launch',
|
||||||
'ask_diff_mode_on_launch',
|
'ask_diff_mode_on_launch',
|
||||||
@ -3252,6 +3256,7 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
|
|||||||
'diff_mode',
|
'diff_mode',
|
||||||
'job_slice_number',
|
'job_slice_number',
|
||||||
'job_slice_count',
|
'job_slice_count',
|
||||||
|
'priority',
|
||||||
'webhook_service',
|
'webhook_service',
|
||||||
'webhook_credential',
|
'webhook_credential',
|
||||||
'webhook_guid',
|
'webhook_guid',
|
||||||
@ -3702,6 +3707,7 @@ class WorkflowJobTemplateWithSpecSerializer(WorkflowJobTemplateSerializer):
|
|||||||
|
|
||||||
class WorkflowJobSerializer(LabelsListMixin, UnifiedJobSerializer):
|
class WorkflowJobSerializer(LabelsListMixin, UnifiedJobSerializer):
|
||||||
limit = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
|
limit = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
|
||||||
|
priority = serializers.IntegerField(required=False, min_value=0, max_value=32000)
|
||||||
scm_branch = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
|
scm_branch = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
|
||||||
|
|
||||||
skip_tags = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
|
skip_tags = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
|
||||||
@ -3722,6 +3728,7 @@ class WorkflowJobSerializer(LabelsListMixin, UnifiedJobSerializer):
|
|||||||
'-controller_node',
|
'-controller_node',
|
||||||
'inventory',
|
'inventory',
|
||||||
'limit',
|
'limit',
|
||||||
|
'priority',
|
||||||
'scm_branch',
|
'scm_branch',
|
||||||
'webhook_service',
|
'webhook_service',
|
||||||
'webhook_credential',
|
'webhook_credential',
|
||||||
@ -3839,6 +3846,7 @@ class LaunchConfigurationBaseSerializer(BaseSerializer):
|
|||||||
job_type = serializers.ChoiceField(allow_blank=True, allow_null=True, required=False, default=None, choices=NEW_JOB_TYPE_CHOICES)
|
job_type = serializers.ChoiceField(allow_blank=True, allow_null=True, required=False, default=None, choices=NEW_JOB_TYPE_CHOICES)
|
||||||
job_tags = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
|
job_tags = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
|
||||||
limit = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
|
limit = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
|
||||||
|
priority = serializers.IntegerField(required=False, min_value=0, max_value=32000)
|
||||||
skip_tags = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
|
skip_tags = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
|
||||||
diff_mode = serializers.BooleanField(required=False, allow_null=True, default=None)
|
diff_mode = serializers.BooleanField(required=False, allow_null=True, default=None)
|
||||||
verbosity = serializers.ChoiceField(allow_null=True, required=False, default=None, choices=VERBOSITY_CHOICES)
|
verbosity = serializers.ChoiceField(allow_null=True, required=False, default=None, choices=VERBOSITY_CHOICES)
|
||||||
@ -3857,6 +3865,7 @@ class LaunchConfigurationBaseSerializer(BaseSerializer):
|
|||||||
'job_tags',
|
'job_tags',
|
||||||
'skip_tags',
|
'skip_tags',
|
||||||
'limit',
|
'limit',
|
||||||
|
'priority',
|
||||||
'skip_tags',
|
'skip_tags',
|
||||||
'diff_mode',
|
'diff_mode',
|
||||||
'verbosity',
|
'verbosity',
|
||||||
@ -4350,6 +4359,7 @@ class JobLaunchSerializer(BaseSerializer):
|
|||||||
job_type = serializers.ChoiceField(required=False, choices=NEW_JOB_TYPE_CHOICES, write_only=True)
|
job_type = serializers.ChoiceField(required=False, choices=NEW_JOB_TYPE_CHOICES, write_only=True)
|
||||||
skip_tags = serializers.CharField(required=False, write_only=True, allow_blank=True)
|
skip_tags = serializers.CharField(required=False, write_only=True, allow_blank=True)
|
||||||
limit = serializers.CharField(required=False, write_only=True, allow_blank=True)
|
limit = serializers.CharField(required=False, write_only=True, allow_blank=True)
|
||||||
|
priority = serializers.IntegerField(required=False, write_only=False, min_value=0, max_value=32000)
|
||||||
verbosity = serializers.ChoiceField(required=False, choices=VERBOSITY_CHOICES, write_only=True)
|
verbosity = serializers.ChoiceField(required=False, choices=VERBOSITY_CHOICES, write_only=True)
|
||||||
execution_environment = serializers.PrimaryKeyRelatedField(queryset=ExecutionEnvironment.objects.all(), required=False, write_only=True)
|
execution_environment = serializers.PrimaryKeyRelatedField(queryset=ExecutionEnvironment.objects.all(), required=False, write_only=True)
|
||||||
labels = serializers.PrimaryKeyRelatedField(many=True, queryset=Label.objects.all(), required=False, write_only=True)
|
labels = serializers.PrimaryKeyRelatedField(many=True, queryset=Label.objects.all(), required=False, write_only=True)
|
||||||
@ -4367,6 +4377,7 @@ class JobLaunchSerializer(BaseSerializer):
|
|||||||
'inventory',
|
'inventory',
|
||||||
'scm_branch',
|
'scm_branch',
|
||||||
'limit',
|
'limit',
|
||||||
|
'priority',
|
||||||
'job_tags',
|
'job_tags',
|
||||||
'skip_tags',
|
'skip_tags',
|
||||||
'job_type',
|
'job_type',
|
||||||
@ -4552,6 +4563,7 @@ class WorkflowJobLaunchSerializer(BaseSerializer):
|
|||||||
extra_vars = VerbatimField(required=False, write_only=True)
|
extra_vars = VerbatimField(required=False, write_only=True)
|
||||||
inventory = serializers.PrimaryKeyRelatedField(queryset=Inventory.objects.all(), required=False, write_only=True)
|
inventory = serializers.PrimaryKeyRelatedField(queryset=Inventory.objects.all(), required=False, write_only=True)
|
||||||
limit = serializers.CharField(required=False, write_only=True, allow_blank=True)
|
limit = serializers.CharField(required=False, write_only=True, allow_blank=True)
|
||||||
|
priority = serializers.IntegerField(required=False, write_only=False, min_value=0, max_value=32000)
|
||||||
scm_branch = serializers.CharField(required=False, write_only=True, allow_blank=True)
|
scm_branch = serializers.CharField(required=False, write_only=True, allow_blank=True)
|
||||||
workflow_job_template_data = serializers.SerializerMethodField()
|
workflow_job_template_data = serializers.SerializerMethodField()
|
||||||
|
|
||||||
@ -4691,13 +4703,14 @@ class BulkJobLaunchSerializer(serializers.Serializer):
|
|||||||
)
|
)
|
||||||
inventory = serializers.PrimaryKeyRelatedField(queryset=Inventory.objects.all(), required=False, write_only=True)
|
inventory = serializers.PrimaryKeyRelatedField(queryset=Inventory.objects.all(), required=False, write_only=True)
|
||||||
limit = serializers.CharField(write_only=True, required=False, allow_blank=False)
|
limit = serializers.CharField(write_only=True, required=False, allow_blank=False)
|
||||||
|
# priority = serializers.IntegerField(write_only=True, required=False, min_value=0, max_value=32000)
|
||||||
scm_branch = serializers.CharField(write_only=True, required=False, allow_blank=False)
|
scm_branch = serializers.CharField(write_only=True, required=False, allow_blank=False)
|
||||||
skip_tags = serializers.CharField(write_only=True, required=False, allow_blank=False)
|
skip_tags = serializers.CharField(write_only=True, required=False, allow_blank=False)
|
||||||
job_tags = serializers.CharField(write_only=True, required=False, allow_blank=False)
|
job_tags = serializers.CharField(write_only=True, required=False, allow_blank=False)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = WorkflowJob
|
model = WorkflowJob
|
||||||
fields = ('name', 'jobs', 'description', 'extra_vars', 'organization', 'inventory', 'limit', 'scm_branch', 'skip_tags', 'job_tags')
|
fields = ('name', 'jobs', 'description', 'extra_vars', 'organization', 'inventory', 'limit', 'priority', 'scm_branch', 'skip_tags', 'job_tags')
|
||||||
read_only_fields = ()
|
read_only_fields = ()
|
||||||
|
|
||||||
def validate(self, attrs):
|
def validate(self, attrs):
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user