X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodeinfo.py;h=ac0b762f8b4955e90a92544cb678d126863cf02c;hb=0ab12188e17261dd130208731b65f5f042969659;hp=29d77bb7f93ea51b61e317c8be2e80110809a2ef;hpb=ac1e9bb99f3acb754054737870093606d56030a1;p=monitor.git

diff --git a/nodeinfo.py b/nodeinfo.py
index 29d77bb..ac0b762 100755
--- a/nodeinfo.py
+++ b/nodeinfo.py
@@ -1,18 +1,18 @@
 #!/usr/bin/python
 
-from monitor.wrapper import plc
+from monitor.wrapper import plc, plccache
 api = plc.getAuthAPI()
 
 from monitor import *
 from monitor import util
 from monitor import parser as parsermodule
 
-from monitor import database
-from pcucontrol  import reboot
+from monitor.database.info.model import *
+from monitor import reboot
 
 import time
 from monitor.model import *
-from nodecommon import *
+from monitor.common import *
 #from monitor.model import node_end_record, PersistFlags
 
 parser = parsermodule.getParser()
@@ -44,7 +44,7 @@ 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')
+	pf = HistoryNodeRecord.get_by(hostname= fbnode['hostname'])
 	try:
 		fbnode['last_change'] = diff_time(pf.last_changed)
 	except:
@@ -55,7 +55,7 @@ def fb_print_nodeinfo(fbnode):
 	else:
 		print "Unknown"
 	print "\t      state |  ssh  |  pcu  | bootcd | category | last change | kernel"
-	if fbnode['bootcd']:
+	if 'bootcd' in fbnode and fbnode['bootcd']:
 		fbnode['bootcd'] = fbnode['bootcd'].split()[-1]
 	else:
 		fbnode['bootcd'] = "unknown"
@@ -63,9 +63,11 @@ def fb_print_nodeinfo(fbnode):
 		fbnode['state'] = color_boot_state(get_current_state(fbnode))
 	else:
 		fbnode['state'] = "none"
-	if len(fbnode['kernel'].split()) > 2:
+	if 'kernel' in fbnode and len(fbnode['kernel'].split()) > 2:
 		fbnode['kernel'] = fbnode['kernel'].split()[2]
-	print "\t       %(state)5s | %(ssh)5.5s | %(pcu)5.5s | %(bootcd)6.6s | %(category)8.8s | %(last_change)11s | %(kernel)s" % fbnode
+	else:
+		fbnode['kernel'] = ""
+	print "\t       %(state)5s | %(ssh_status)5.5s | %(bootcd)6.6s | %(observed_category)8.8s | %(last_change)11s | %(kernel)s" % fbnode
 
 def act_print_nodeinfo(actnode, header):
 	if header[0]:
@@ -101,6 +103,7 @@ def act_print_nodeinfo(actnode, header):
 
 def pcu_print_info(pcuinfo, hostname):
 	print "   Checked: ",
+	pcuinfo.update(pcuinfo['plc_pcu_stats'])
 	if 'checked' in pcuinfo:
 		print "%11.11s " % diff_time(pcuinfo['checked'])
 	else:
@@ -111,23 +114,23 @@ def pcu_print_info(pcuinfo, hostname):
 		(pcuinfo['username'], pcuinfo['password'], 
 		 pcuinfo[hostname], pcuinfo['pcu_id'], reboot.pcu_name(pcuinfo), pcuinfo['model'])
 
-	if 'portstatus' in pcuinfo and pcuinfo['portstatus'] != {} and pcuinfo['portstatus'] != None:
-		if pcuinfo['portstatus']['22'] == "open":
+	if 'port_status' in pcuinfo and pcuinfo['port_status'] != {} and pcuinfo['port_status'] != None:
+		if pcuinfo['port_status']['22'] == "open":
 			print "\t ssh -o PasswordAuthentication=yes -o PubkeyAuthentication=no %s@%s" % (pcuinfo['username'], reboot.pcu_name(pcuinfo))
-		if pcuinfo['portstatus']['23'] == "open":
+		if pcuinfo['port_status']['23'] == "open":
 			print "\t telnet %s" % (reboot.pcu_name(pcuinfo))
-		if pcuinfo['portstatus']['80'] == "open" or \
-			pcuinfo['portstatus']['443'] == "open":
+		if pcuinfo['port_status']['80'] == "open" or \
+			pcuinfo['port_status']['443'] == "open":
 			print "\t https://%s" % (reboot.pcu_name(pcuinfo))
 			print "\t import %s.png" % (reboot.pcu_name(pcuinfo))
 			print """\t mutt -s "crash for %s" -a %s.png sapanb@cs.princeton.edu < /dev/null""" % (hostname, reboot.pcu_name(pcuinfo))
-		if pcuinfo['portstatus']['443'] == "open":
+		if pcuinfo['port_status']['443'] == "open":
 			print "\t racadm.py -r %s -u %s -p '%s'" % (pcuinfo['ip'], pcuinfo['username'], pcuinfo['password'])
 			print "\t cmdhttps/locfg.pl -s %s -f iloxml/Reset_Server.xml -u %s -p '%s' | grep MESSAGE" % \
 				(reboot.pcu_name(pcuinfo), pcuinfo['username'], pcuinfo['password'])
 			print "\t cmdhttps/locfg.pl -s %s -f iloxml/License.xml -u %s -p '%s' | grep MESSAGE" % \
 				(reboot.pcu_name(pcuinfo), pcuinfo['username'], pcuinfo['password'])
-		if pcuinfo['portstatus']['16992'] == "open":
+		if pcuinfo['port_status']['16992'] == "open":
 			print "\t ./cmdamt/remoteControl -A -verbose 'http://%s:16992/RemoteControlService' -user admin -pass '%s'" % (reboot.pcu_name(pcuinfo), pcuinfo['password'])
 
 if config.findbad:
@@ -140,7 +143,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)
@@ -148,9 +151,9 @@ for node in config.args:
 	fb_nodeinfo['hostname'] = node
 	fb_print_nodeinfo(fb_nodeinfo)
 
-	if fb_nodeinfo['pcu'] == "PCU":
-		pcu = reboot.get_pcu_values(fb_nodeinfo['plcnode']['pcu_ids'][0])
-		if pcu: pcu_print_info(pcu, config.node)
+	if fb_nodeinfo['plc_pcuid'] > 0:
+		pcu = FindbadPCURecord.get_latest_by(plc_pcuid=fb_nodeinfo['plc_pcuid'])
+		if pcu: pcu_print_info(pcu.to_dict(), config.node)
 
 	try:
 		act_all = database.dbLoad("act_all")