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

remove job start endpoint in v2

Browse Source
This commit is contained in:
AlanCoding
2017-08-26 16:05:33 -04:00
parent 34a375542e
commit 495d6e9887
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -2525,7 +2525,7 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
if obj.job_template: if obj.job_template:
res['job_template'] = self.reverse('api:job_template_detail', res['job_template'] = self.reverse('api:job_template_detail',
kwargs={'pk': obj.job_template.pk}) kwargs={'pk': obj.job_template.pk})
if obj.can_start or True: if (obj.can_start or True) and self.version == 1: # TODO: remove in 3.3
res['start'] = self.reverse('api:job_start', kwargs={'pk': obj.pk}) res['start'] = self.reverse('api:job_start', kwargs={'pk': obj.pk})
if obj.can_cancel or True: if obj.can_cancel or True:
res['cancel'] = self.reverse('api:job_cancel', kwargs={'pk': obj.pk}) res['cancel'] = self.reverse('api:job_cancel', kwargs={'pk': obj.pk})

2
awx/api/urls.py
View File

@@ -215,7 +215,7 @@ job_template_urls = patterns('awx.api.views',
job_urls = patterns('awx.api.views', job_urls = patterns('awx.api.views',
url(r'^$', 'job_list'), url(r'^$', 'job_list'),
url(r'^(?P<pk>[0-9]+)/$', 'job_detail'), url(r'^(?P<pk>[0-9]+)/$', 'job_detail'),
url(r'^(?P<pk>[0-9]+)/start/$', 'job_start'), url(r'^(?P<pk>[0-9]+)/start/$', 'job_start'), # TODO: remove in 3.3
url(r'^(?P<pk>[0-9]+)/cancel/$', 'job_cancel'), url(r'^(?P<pk>[0-9]+)/cancel/$', 'job_cancel'),
url(r'^(?P<pk>[0-9]+)/relaunch/$', 'job_relaunch'), url(r'^(?P<pk>[0-9]+)/relaunch/$', 'job_relaunch'),
url(r'^(?P<pk>[0-9]+)/job_host_summaries/$', 'job_job_host_summaries_list'), url(r'^(?P<pk>[0-9]+)/job_host_summaries/$', 'job_job_host_summaries_list'),

9
awx/api/views.py
View File

@@ -3795,6 +3795,7 @@ class JobActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIView):
new_in_145 = True new_in_145 = True
# TODO: remove endpoint in 3.3
class JobStart(GenericAPIView): class JobStart(GenericAPIView):
model = Job model = Job
@@ -3802,7 +3803,13 @@ class JobStart(GenericAPIView):
is_job_start = True is_job_start = True
deprecated = True deprecated = True
def v2_not_allowed(self):
return Response({'detail': 'Action only possible through v1 API.'},
status=status.HTTP_404_NOT_FOUND)
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
if get_request_version(request) > 1:
return self.v2_not_allowed()
obj = self.get_object() obj = self.get_object()
data = dict( data = dict(
can_start=obj.can_start, can_start=obj.can_start,
@@ -3813,6 +3820,8 @@ class JobStart(GenericAPIView):
return Response(data) return Response(data)
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
if get_request_version(request) > 1:
return self.v2_not_allowed()
obj = self.get_object() obj = self.get_object()
if obj.can_start: if obj.can_start:
result = obj.signal_start(**request.data) result = obj.signal_start(**request.data)