X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodeinfo.py;h=726f250b31f437a4583918a647cc96a9b06316ee;hb=c9d06f3b274ecbc092a0b3eb1f5ceb6c0f734aad;hp=9afed5c13f9ff1107e8df3b7af8417a0eb0f7efd;hpb=c678c008f0c3a10947b38880e52005a856e1b122;p=monitor.git diff --git a/nodeinfo.py b/nodeinfo.py index 9afed5c..726f250 100755 --- a/nodeinfo.py +++ b/nodeinfo.py @@ -7,8 +7,8 @@ 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 * @@ -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: @@ -140,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)