Merge lp:~stylesen/lava-scheduler/multinode into lp:lava-scheduler/multinode

[Senthil Kumaran S]

Add ability to cancel multinode jobs.

[Neil Williams (codehelp)]

Approved, thanks.

review: Approve

[lp:~stylesen/lava-scheduler/multinode]

276. By Neil Williams on 2013-08-16

Senthil Kumaran 2013-08-16 Add ability to cancel multinode jobs.

=== modified file 'lava_scheduler_app/api.py'
--- lava_scheduler_app/api.py	2013-08-16 07:59:57 +0000
+++ lava_scheduler_app/api.py	2013-08-16 09:30:49 +0000
@@ -60,7 +60,13 @@
         job = TestJob.objects.get(pk=job_id)
         if not job.can_cancel(self.user):
             raise xmlrpclib.Fault(403, "Permission denied.")
-        job.cancel()
+        if job.target_group:
+            multinode_jobs = TestJob.objects.all().filter(
+                target_group=job.target_group)
+            for multinode_job in multinode_jobs:
+                multinode_job.cancel()
+        else:
+            job.cancel()
         return True
 
     def job_output(self, job_id):
 
=== modified file 'lava_scheduler_app/views.py'
--- lava_scheduler_app/views.py	2013-08-16 07:59:57 +0000
+++ lava_scheduler_app/views.py	2013-08-16 09:30:49 +0000
@@ -800,7 +800,13 @@
 def job_cancel(request, pk):
     job = get_restricted_job(request.user, pk)
     if job.can_cancel(request.user):
-        job.cancel()
+        if job.target_group:
+            multinode_jobs = TestJob.objects.all().filter(
+                target_group=job.target_group)
+            for multinode_job in multinode_jobs:
+                multinode_job.cancel()
+        else:
+            job.cancel()
         return redirect(job)
     else:
         return HttpResponseForbidden(