Merge pull request #228 from globocom/task_history_api

Task history api

Author: ricardosdias

dbaas/backup/tasks.py

@@ -193,7 +193,7 @@ def make_instance_snapshot_backup(instance, error):
 
 
 @app.task(bind=True)
-@only_one(key="makedatabasebackupkey", timeout=1200)
+@only_one(key="makedatabasebackupkey")
 def make_databases_backup(self):
 
     LOG.info("Making databases backups")
@@ -269,7 +269,7 @@ def remove_snapshot_backup(snapshot):
 
 
 @app.task(bind=True)
-@only_one(key="removedatabaseoldbackupkey", timeout=1200)
+@only_one(key="removedatabaseoldbackupkey")
 def remove_database_old_backups(self):
 
     worker_name = get_worker_name()

dbaas/dbaas/urls.py

@@ -9,32 +9,26 @@
 
 admin.autodiscover()
 
-urlpatterns = patterns('',
-                       # Examples:
-                       url(r'^$', RedirectView.as_view(
-                           url='/admin'), name='home'),
-                       # url(r'^dbaas/', include('dbaas.foo.urls')),
-
-                       # Uncomment the admin/doc line below to enable admin documentation:
-                       # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-                       # Uncomment the next line to enable the admin:
-                       url(r'^admin/', include(admin.site.urls)),
-                       url(r'^dashboard/', include('dashboard.urls')),
-                       url(r'^([^/]+)/tsuru/', include('tsuru.urls'),),
-                       url(r'^logical/', include('logical.urls')),
-                       url(r'^account/', include('account.urls')),
-                       url(r'^system/', include('system.urls')),
-                       url('^api/', include(api.urls)),
-                       url('^extra_dns/', include('extra_dns.urls')),
-                       # url(r'^acl/', include('dbaas_aclapi.urls')),
-                       url(r'^admin/', include('dbaas_services.analyzing.urls')),
-                       (r'^ckeditor/', include('ckeditor.urls')),
-                       )
+urlpatterns = patterns(
+    '',
+    url(r'^$', RedirectView.as_view(url='/admin'), name='home'),
+    url(r'^admin/', include(admin.site.urls)),
+    url(r'^dashboard/', include('dashboard.urls')),
+    url(r'^([^/]+)/tsuru/', include('tsuru.urls')),
+    url(r'^logical/', include('logical.urls')),
+    url(r'^account/', include('account.urls')),
+    url(r'^system/', include('system.urls')),
+    url('^api/', include(api.urls)),
+    url('^extra_dns/', include('extra_dns.urls')),
+    url(r'^admin/', include('dbaas_services.analyzing.urls')),
+    url(r'^notification/', include('notification.urls'), name="notification"),
+    url(r'^ckeditor/', include('ckeditor.urls')),
+)
 
 # django flatpages
-urlpatterns += patterns('django.contrib.flatpages.views',
-                        (r'^(?P<url>.*/)$', 'flatpage'),)
+urlpatterns += patterns(
+    'django.contrib.flatpages.views', (r'^(?P<url>.*/)$', 'flatpage'),
+)
 
 if settings.DEBUG:
     urlpatterns += staticfiles_urlpatterns()

dbaas/notification/models.py

@@ -176,3 +176,11 @@ def register(cls, request=None, user=None, task_history=None, worker_name=None):
         task_history.save()
 
         return task_history
+
+    @classmethod
+    def running_tasks(cls):
+        return cls.objects.filter(task_status=cls.STATUS_RUNNING)
+
+    @classmethod
+    def waiting_tasks(cls):
+        return cls.objects.filter(task_status=cls.STATUS_WAITING)

dbaas/notification/tests/factory.py

@@ -4,10 +4,10 @@
 from .. import models
 
 
-class NotificationHistoryFactory(factory.DjangoModelFactory):
+class TaskHistoryFactory(factory.DjangoModelFactory):
     FACTORY_FOR = models.TaskHistory
 
     task_name = factory.Sequence(lambda n: 'task_name_{0}'.format(n))
     task_id = factory.Sequence(lambda n: 'task_id_{0}'.format(n))
     user = factory.Sequence(lambda n: 'user_{0}'.format(n))
-    task_status = "PENDING"
+    task_status = models.TaskHistory.STATUS_PENDING

dbaas/notification/tests/test_disk_resize.py

@@ -5,7 +5,7 @@
 from physical.tests import factory as physical_factory
 from logical.tests import factory as logical_factory
 from ..tasks_disk_resize import update_disk
-from .factory import NotificationHistoryFactory
+from .factory import TaskHistoryFactory
 
 UPDATE_USED_SIZE_SUCCESS = '---> Used disk size updated. NFS: {}'
 UPDATE_USED_SIZE_WRONG_HOST = '---> {} not found for: {}'
@@ -16,7 +16,7 @@
 class DiskResizeTestCase(TestCase):
 
     def setUp(self):
-        self.task = NotificationHistoryFactory()
+        self.task = TaskHistoryFactory()
         self.instance = physical_factory.InstanceFactory()
         self.databaseinfra = self.instance.databaseinfra
 

dbaas/notification/tests/test_task_history.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 from django.test import TestCase
-from .factory import NotificationHistoryFactory
+from notification.models import TaskHistory
+from notification.tests.factory import TaskHistoryFactory
 
 
 class TaskHistoryTestCase(TestCase):
 
     def setUp(self):
-        self.task = NotificationHistoryFactory()
+        self.task = TaskHistoryFactory()
 
     def test_can_add_message_detail(self):
         self.assertIsNone(self.task.details)
@@ -26,3 +27,27 @@ def test_can_add_message_detail_with_level(self):
 
         self.task.add_detail(message='Again, with new line', level=2)
         self.assertEqual('-> Testing\n--> Again, with new line', self.task.details)
+
+    def test_can_get_running_tasks(self):
+        self.task.task_status = TaskHistory.STATUS_RUNNING
+        self.task.save()
+
+        tasks = TaskHistory.running_tasks()
+        self.assertIsNotNone(tasks)
+        self.assertIn(self.task, tasks)
+
+    def test_can_get_running_tasks_empty(self):
+        tasks = TaskHistory.running_tasks()
+        self.assertEqual(len(tasks), 0)
+
+    def test_can_get_waiting_tasks(self):
+        self.task.task_status = TaskHistory.STATUS_WAITING
+        self.task.save()
+
+        tasks = TaskHistory.waiting_tasks()
+        self.assertIsNotNone(tasks)
+        self.assertIn(self.task, tasks)
+
+    def test_can_get_waiting_tasks_empty(self):
+        tasks = TaskHistory.waiting_tasks()
+        self.assertEqual(len(tasks), 0)

dbaas/notification/tests/test_urls.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+from json import loads
+from django.test import TestCase
+from django.core.urlresolvers import reverse
+from notification.models import TaskHistory
+from notification.views import running_tasks_api, waiting_tasks_api
+from notification.tests.factory import TaskHistoryFactory
+
+
+class UrlTest(TestCase):
+
+    def test_can_access_tasks_running(self):
+        url = reverse(running_tasks_api)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+        tasks = loads(response.content)
+        self.assertEqual(len(tasks), 0)
+
+    def test_find_tasks_running(self):
+        task_running = TaskHistoryFactory()
+        task_running.task_status = TaskHistory.STATUS_RUNNING
+        task_running.save()
+        task_pending = TaskHistoryFactory()
+
+        url = reverse(running_tasks_api)
+        response = self.client.get(url)
+        tasks = loads(response.content)
+
+        self.assertIn(str(task_running.id), tasks)
+        self.assertEqual(tasks[str(task_running.id)], task_running.task_name)
+        self.assertNotIn(str(task_pending.id), tasks)
+
+    def test_can_access_tasks_waiting(self):
+        url = reverse(waiting_tasks_api)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+        tasks = loads(response.content)
+        self.assertEqual(len(tasks), 0)
+
+    def test_find_tasks_waiting(self):
+        task_waiting = TaskHistoryFactory()
+        task_waiting.task_status = TaskHistory.STATUS_WAITING
+        task_waiting.save()
+        task_pending = TaskHistoryFactory()
+
+        url = reverse(waiting_tasks_api)
+        response = self.client.get(url)
+        tasks = loads(response.content)
+
+        self.assertIn(str(task_waiting.id), tasks)
+        self.assertEqual(tasks[str(task_waiting.id)], task_waiting.task_name)
+        self.assertNotIn(str(task_pending.id), tasks)

dbaas/notification/urls.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+from django.conf.urls import patterns, url
+import views
+
+
+urlpatterns = patterns(
+    views,
+    url(r"^tasks_running/$", views.running_tasks_api, name="notification:tasks_running"),
+    url(r"^tasks_waiting/$", views.waiting_tasks_api, name="notification:tasks_waiting"),
+)

dbaas/notification/views.py

@@ -1 +1,20 @@
-# Create your views here.
+# -*- coding: utf-8 -*-
+from json import dumps
+from django.http import HttpResponse
+from models import TaskHistory
+
+
+def running_tasks_api(self):
+    tasks = TaskHistory.running_tasks()
+    response_json = dumps({
+        task.id: task.task_name for task in tasks
+    })
+    return HttpResponse(response_json, content_type="application/json")
+
+
+def waiting_tasks_api(self):
+    tasks = TaskHistory.waiting_tasks()
+    response_json = dumps({
+        task.id: task.task_name for task in tasks
+    })
+    return HttpResponse(response_json, content_type="application/json")