From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Tue, 11 Dec 2007 22:45:09 +0000 (+0000)
Subject: record a node's boot_state according to PLC's db.
X-Git-Tag: Monitor-1.0-0~17
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7468d9b7b7d8ade71511c388d9305542e2133001;p=monitor.git

record a node's boot_state according to PLC's db.
---

diff --git a/findbad.py b/findbad.py
index 618febc..d1ee263 100755
--- a/findbad.py
+++ b/findbad.py
@@ -104,7 +104,7 @@ def collectPingAndSSH(nodename, cohash):
 		val = oval
 		if "BootCD" in val:
 			values['bootcd'] = val
-			if "v2" in val:
+			if "v2" in val and nodename is not "planetlab1.cs.unc.edu":
 				values['category'] = 'OLDBOOTCD'
 		else:
 			values['bootcd'] = ""
@@ -127,7 +127,7 @@ def collectPingAndSSH(nodename, cohash):
 	plc_lock.acquire()
 
 	try:
-		d_node = plc.getNodes({'hostname': nodename}, ['pcu_ids', 'site_id', 'last_contact'])
+		d_node = plc.getNodes({'hostname': nodename}, ['pcu_ids', 'site_id', 'last_contact', 'boot_state'])
 	except:
 		b_except = True
 		import traceback
@@ -147,6 +147,7 @@ def collectPingAndSSH(nodename, cohash):
 		last_contact = d_node[0]['last_contact']
 		values['plcnode'] = {'status' : 'SUCCESS', 
 							'pcu_ids': pcu, 
+							'boot_state' : d_node[0]['boot_state'],
 							'site_id': site_id,
 							'last_contact': last_contact}
 	else: