X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodeinfo.py;h=726f250b31f437a4583918a647cc96a9b06316ee;hb=15d79125cf2f49bb4f6ece93ae423689175518f9;hp=4a946c5d4640273e162ca37f1fb3732de32c9ead;hpb=90b2e8e7cb145cb1f6b3780867617084441b6ca9;p=monitor.git

diff --git a/nodeinfo.py b/nodeinfo.py
index 4a946c5..726f250 100755
--- a/nodeinfo.py
+++ b/nodeinfo.py
@@ -7,13 +7,13 @@ from monitor import *
 from monitor import util
 from monitor import parser as parsermodule
 
-from monitor import database
-from monitor.pcu import reboot
+from monitor.database.info.model import *
+from monitor import reboot
 
 import time
-from model import *
-from nodecommon import *
-from unified_model import node_end_record, PersistFlags
+from monitor.model import *
+from monitor.common import *
+#from monitor.model import node_end_record, PersistFlags
 
 parser = parsermodule.getParser()
 parser.set_defaults(node=None, 
@@ -44,8 +44,11 @@ def plc_print_nodeinfo(plcnode):
 		 diff_time(plcnode['last_contact']), plcnode['key'])
 
 def fb_print_nodeinfo(fbnode):
-	pf = PersistFlags(fbnode['hostname'], 1, db='node_persistflags')
-	fbnode['last_change'] = diff_time(pf.last_changed)
+	pf = HistoryNodeRecord.get_by(hostname= fbnode['hostname'])
+	try:
+		fbnode['last_change'] = diff_time(pf.last_changed)
+	except:
+		fbnode['last_change'] = diff_time(time.time())
 	print "   Checked: ",
 	if 'checked' in fbnode:
 		print "%11.11s " % diff_time(fbnode['checked'])
@@ -137,7 +140,7 @@ if config.findbad:
 for node in config.args:
 	config.node = node
 
-	plc_nodeinfo = api.GetNodes({'hostname': config.node}, None)[0]
+	plc_nodeinfo = plccache.GetNodeByName(config.node)
 	fb_noderec = FindbadNodeRecord.get_latest_by(hostname=node) 
 	fb_nodeinfo = fb_noderec.to_dict()
 	plc_print_nodeinfo(plc_nodeinfo)