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

[Senthil Kumaran S]

Bring up-to-date with trunk.

[Neil Williams (codehelp)]

Approved.

review: Approve

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

266. By Neil Williams on 2013-07-24

Senthil Kumaran 2013-07-23 [merge] Bring up-to-date with trunk.
  Senthil Kumaran 2013-07-22 Remove commented out code in models.py since we are already version
  Tyler Baker 2013-07-06 [merge] Add job status
  Arthur She 2013-07-03 Fix some typos and complete the description of job_status() API.
  Arthur She 2013-07-03 Add API job_status() for polling job status.

=== modified file 'lava_scheduler_app/api.py'
--- lava_scheduler_app/api.py	2013-07-22 09:26:30 +0000
+++ lava_scheduler_app/api.py	2013-07-23 04:52:26 +0000
@@ -239,3 +239,56 @@
             raise xmlrpclib.Fault(404, "Specified job not found.")
 
         return job
+
+    def job_status(self, job_id):
+        """
+        Name
+        ----
+        `job_status` (`job_id`)
+
+        Description
+        -----------
+        Get the status of given job id.
+
+        Arguments
+        ---------
+        `job_id`: string
+            Job id for which the output is required.
+
+        Return value
+        ------------
+        This function returns an XML-RPC structures of job status with the follwing fields.
+        The user is authenticated with an username and token.
+ 
+        `job_status`: string
+                    ['Submitted'|'Running'|'Complete'|'Incomplete'|'Canceled'|'Canceling']
+
+        `bundle_sha1`: string
+                     The sha1 hash code of the bundle, if it existed. Otherwise it will be an empty string.
+        """
+
+        if not self.user:
+            raise xmlrpclib.Fault(
+                401, "Authentication with user and token required for this "
+                "API.")
+
+        try:
+            job = TestJob.objects.accessible_by_principal(self.user).get(
+                pk=job_id)
+        except TestJob.DoesNotExist:
+            raise xmlrpclib.Fault(404, "Specified job not found.")
+
+
+        bundle_sha1 = ""
+        try:
+            bundle_sha1 = job.results_link.split('/')[-2]
+        except:
+            pass
+
+        job_status = {
+                      'job_status': job.get_status_display(),
+                      'bundle_sha1': bundle_sha1
+                     }
+
+        return job_status
+

=== modified file 'lava_scheduler_app/models.py'
--- lava_scheduler_app/models.py	2013-07-22 09:34:35 +0000
+++ lava_scheduler_app/models.py	2013-07-23 04:52:26 +0000
@@ -237,10 +237,6 @@
         self.health_status = Device.HEALTH_LOOPING
         self.save()
 
-    #@classmethod
-    #def find_devices_by_type(cls, device_type):
-    #    return device_type.device_set.all()
-
 
 class JobFailureTag(models.Model):
     """