diff mbox

[Branch,~linaro-validation/lava-scheduler/trunk] Rev 134: change health enum names and set board to unknown health when onlining (Spring Zhang)

Message ID 20120223024912.18697.92896.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson Feb. 23, 2012, 2:49 a.m. UTC 
Merge authors:
  Spring Zhang (qzhang)
Related merge proposals:
  https://code.launchpad.net/~qzhang/lava-scheduler/set-unknown-when-online/+merge/93736
  proposed by: Spring Zhang (qzhang)
  review: Approve - Michael Hudson-Doyle (mwhudson)
------------------------------------------------------------
revno: 134 [merge]
committer: Michael Hudson-Doyle <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Thu 2012-02-23 15:47:34 +1300
message:
  change health enum names and set board to unknown health when onlining (Spring Zhang)
modified:
  lava_scheduler_app/models.py
  lava_scheduler_daemon/dbjobsource.py


--
lp:lava-scheduler
https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk

You are subscribed to branch lp:lava-scheduler.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_scheduler_app/models.py'
--- lava_scheduler_app/models.py	2012-02-16 01:22:23 +0000
+++ lava_scheduler_app/models.py	2012-02-19 15:21:55 +0000
@@ -51,11 +51,11 @@ 
     )
 
     # A device health shows a device is ready to test or not
-    HEALTH_UNKNOWN, HEALTH_HEALTHY, HEALTH_SICK = range(3)
+    HEALTH_UNKNOWN, HEALTH_PASS, HEALTH_FAIL = range(3)
     HEALTH_CHOICES = (
         (HEALTH_UNKNOWN, 'Unknown'),
-        (HEALTH_HEALTHY, 'Healthy'),
-        (HEALTH_SICK, 'Sick'),
+        (HEALTH_PASS, 'Pass'),
+        (HEALTH_FAIL, 'Fail'),
     )
 
     hostname = models.CharField(
@@ -132,6 +132,7 @@ 
             created_by=user, device=self, old_state=self.status,
             new_state=new_status, message=reason, job=None).save()
         self.status = new_status
+        self.health_status = Device.HEALTH_UNKNOWN
         self.save()
 
     #@classmethod

=== modified file 'lava_scheduler_daemon/dbjobsource.py'
--- lava_scheduler_daemon/dbjobsource.py	2012-02-10 20:08:25 +0000
+++ lava_scheduler_daemon/dbjobsource.py	2012-02-19 15:21:55 +0000
@@ -218,10 +218,10 @@ 
         if job.health_check is True:
             device.last_health_report_job = job
             if job.status == TestJob.INCOMPLETE:
-                device.health_status = Device.HEALTH_SICK
+                device.health_status = Device.HEALTH_FAIL
                 device.put_into_maintenance_mode(None, "Health Check Job Failed")
             elif job.status == TestJob.COMPLETE:
-                device.health_status = Device.HEALTH_HEALTHY
+                device.health_status = Device.HEALTH_PASS
 
         job.end_time = datetime.datetime.utcnow()
         token = job.submit_token