From d11405d0896132a98a9d27b4e328d9e1b05269dd Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Thu, 18 Apr 2013 15:22:45 -0400 Subject: [PATCH] Stub views for all things job and event related. --- lib/main/models/__init__.py | 14 -------------- lib/main/views.py | 37 +++++++++++++++++++++++++++++++++++++ lib/urls.py | 34 ++++++++++++++++++++++++++-------- 3 files changed, 63 insertions(+), 22 deletions(-) diff --git a/lib/main/models/__init__.py b/lib/main/models/__init__.py index ea04e48c73..c5a082f8d4 100644 --- a/lib/main/models/__init__.py +++ b/lib/main/models/__init__.py @@ -744,14 +744,6 @@ class JobTemplate(CommonModel): default=None, on_delete=models.SET_NULL, ) - user = models.ForeignKey( - 'auth.User', - related_name='job_templates', - blank=True, - null=True, - default=None, - on_delete=models.SET_NULL, - ) # project has one default playbook but really should have a list of playbooks and flags ... @@ -820,12 +812,6 @@ class Job(CommonModel): null=True, on_delete=models.SET_NULL, ) - user = models.ForeignKey( - 'auth.User', - related_name='jobs', - null=True, - on_delete=models.SET_NULL, - ) status = models.CharField( max_length=20, choices=STATUS_CHOICES, diff --git a/lib/main/views.py b/lib/main/views.py index 9b39d5f8af..7eac0fd952 100644 --- a/lib/main/views.py +++ b/lib/main/views.py @@ -735,5 +735,42 @@ class VariableDetail(BaseDetail): def put(self, request, *args, **kwargs): raise PermissionDenied() +class JobTemplatesList(BaseList): + pass +class JobTemplateDetail(BaseDetail): + pass + +class JobTemplateStart(BaseDetail): + pass + +class JobsList(BaseList): + pass + +class JobsDetail(BaseDetail): + pass + +class JobsHostsList(BaseSubList): + pass + +class JobsSuccessfulHostsList(BaseSubList): + pass + +class JobsChangedHostsList(BaseSubList): + pass + +class JobsFailedHostsList(BaseSubList): + pass + +class JobsUnreachableHostsList(BaseSubList): + pass + +class JobsEventsList(BaseList): + pass + +class JobsEventsDetail(BaseDetail): + pass + +class HostJobEventsList(BaseSubList): + pass diff --git a/lib/urls.py b/lib/urls.py index 8a8c71b214..174b8a62a2 100644 --- a/lib/urls.py +++ b/lib/urls.py @@ -77,11 +77,20 @@ views_HostsVariableDetail = views.HostsVariableDetail.as_view() # seperate variable data views_VariableDetail = views.VariableDetail.as_view() -# log data services - -# events services - # jobs services +views_JobTemplatesList = views.JobTemplatesList.as_view() +views_JobTemplateDetail = views.JobTemplateDetail.as_view() +views_JobTemplateStart = views.JobTemplateStart.as_view() +views_JobsList = views.JobsList.as_view() +views_JobsDetail = views.JobsDetail.as_view() +views_JobsHostsList = views.JobsHostsList.as_view() +views_JobsSuccessfulHostsList = views.JobsSuccessfulHostsList.as_view() +views_JobsChangedHostsList = views.JobsChangedHostsList.as_view() +views_JobsFailedHostsList = views.JobsFailedHostsList.as_view() +views_JobsUnreachableHostsList = views.JobsUnreachableHostsList.as_view() +views_JobsEventsList = views.JobsEventsList.as_view() +views_JobsEventsDetail = views.JobsEventsDetail.as_view() +views_HostJobEventsList = views.HostJobEventsList.as_view() # tags service views_TagsDetail = views.TagsDetail.as_view() @@ -160,10 +169,19 @@ urlpatterns = patterns('', # log data (results) services # jobs & job status services - # /jobs/ - # /jobs/N/ - # /job_statuses/ - # /job_statuses/N/ + url(r'^api/v1/job_templates/$', views_JobTemplatesList), + url(r'^api/v1/job_templates/(?P[0-9]+)/$', views_JobTemplateDetail), + url(r'^api/v1/job_templates/(?P[0-9]+)/start$', views_JobTemplateStart), + url(r'^api/v1/jobs/$', views_JobsList), + url(r'^api/v1/jobs/(?P[0-9]+)/$', views_JobsDetail), + url(r'^api/v1/jobs/(?P[0-9]+)/hosts$', views_JobsHostsList), + url(r'^api/v1/jobs/(?P[0-9]+)/successful_hosts$', views_JobsSuccessfulHostsList), + url(r'^api/v1/jobs/(?P[0-9]+)/changed_hosts$', views_JobsChangedHostsList), + url(r'^api/v1/jobs/(?P[0-9]+)/failed_hosts$', views_JobsFailedHostsList), + url(r'^api/v1/jobs/(?P[0-9]+)/unreachable_hosts$', views_JobsUnreachableHostsList), + url(r'^api/v1/job_events/$', views_JobsEventsList), + url(r'^api/v1/job_events/(?P[0-9]+)/$', views_JobsEventsDetail), + url(r'^api/v1/hosts/(?P[0-9]+)/job_events/', views_HostJobEventsList), # tags service url(r'^api/v1/tags/(?P[0-9]+)/$', views_TagsDetail),