From 07996abf645ebcafa8e6be843b47629bb5eb3a05 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Thu, 17 Nov 2016 10:29:34 -0500 Subject: [PATCH 1/2] in the api, finish renaming wfjt -> job relation related to #4052 related to #3976 --- awx/api/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 2148ed5ac2..4fea827ec0 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2208,7 +2208,7 @@ class WorkflowJobTemplateSerializer(LabelsListMixin, UnifiedJobTemplateSerialize def get_related(self, obj): res = super(WorkflowJobTemplateSerializer, self).get_related(obj) res.update(dict( - jobs = reverse('api:workflow_job_template_jobs_list', args=(obj.pk,)), + workflow_jobs = reverse('api:workflow_job_template_jobs_list', args=(obj.pk,)), schedules = reverse('api:workflow_job_template_schedules_list', args=(obj.pk,)), launch = reverse('api:workflow_job_template_launch', args=(obj.pk,)), workflow_nodes = reverse('api:workflow_job_template_workflow_nodes_list', args=(obj.pk,)), From ef0df1fefdb1a491fd0f35e3dce5744afef410fc Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Thu, 17 Nov 2016 10:47:04 -0500 Subject: [PATCH 2/2] more j -> workflow_job renaming --- awx/api/urls.py | 2 +- awx/api/views.py | 2 +- .../tests/unit/api/serializers/test_workflow_serializers.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/api/urls.py b/awx/api/urls.py index 8e349008e6..f0bc97e99e 100644 --- a/awx/api/urls.py +++ b/awx/api/urls.py @@ -260,7 +260,7 @@ system_job_urls = patterns('awx.api.views', workflow_job_template_urls = patterns('awx.api.views', url(r'^$', 'workflow_job_template_list'), url(r'^(?P[0-9]+)/$', 'workflow_job_template_detail'), - url(r'^(?P[0-9]+)/jobs/$', 'workflow_job_template_jobs_list'), + url(r'^(?P[0-9]+)/workflow_jobs/$', 'workflow_job_template_jobs_list'), url(r'^(?P[0-9]+)/launch/$', 'workflow_job_template_launch'), url(r'^(?P[0-9]+)/schedules/$', 'workflow_job_template_schedules_list'), url(r'^(?P[0-9]+)/survey_spec/$', 'workflow_job_template_survey_spec'), diff --git a/awx/api/views.py b/awx/api/views.py index 213581b253..79445dacd0 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -2984,7 +2984,7 @@ class WorkflowJobTemplateJobsList(SubListAPIView): model = WorkflowJob serializer_class = WorkflowJobListSerializer parent_model = WorkflowJobTemplate - relationship = 'jobs' + relationship = 'workflow_jobs' parent_key = 'workflow_job_template' diff --git a/awx/main/tests/unit/api/serializers/test_workflow_serializers.py b/awx/main/tests/unit/api/serializers/test_workflow_serializers.py index 4f11ce64be..b444531206 100644 --- a/awx/main/tests/unit/api/serializers/test_workflow_serializers.py +++ b/awx/main/tests/unit/api/serializers/test_workflow_serializers.py @@ -26,7 +26,7 @@ class TestWorkflowJobTemplateSerializerGetRelated(): return wfjt @pytest.mark.parametrize("related_resource_name", [ - 'jobs', + 'workflow_jobs', 'launch', 'workflow_nodes', ])