Tagging module Monitor - Monitor-2.0-7

[monitor.git] / nodegroups.py

diff --git a/nodegroups.py b/nodegroups.py
index 9e14e2f..056f5b8 100755 (executable)
--- a/nodegroups.py
+++ b/nodegroups.py
@@ -14,7 +14,7 @@
 #  * 
 
 from monitor import database
-from monitor.database import FindbadNodeRecord
+from monitor.database.info.model import FindbadNodeRecord
 from monitor import util
 from monitor.wrapper import plc
 from monitor import parser as parsermodule
@@ -22,7 +22,7 @@ from monitor import parser as parsermodule
 api = plc.getAuthAPI()
 
 from nodequery import verify,query_to_dict,node_select
-from nodecommon import *
+from monitor.common import *
 from sets import Set
 
 def main():
@@ -121,7 +121,7 @@ def main():
                i = 1
                for node in nodelist:
                        print "%-2d" % i, 
-                       fbrec = FindbadNodeRecord.query.filter(FindbadNodeRecord.hostname==node['hostname']).order_by(FindbadNodeRecord.date_checked.desc()).first()
+                       fbrec = FindbadNodeRecord.get_latest_by(hostname=node['hostname'])
                        fbdata = fbrec.to_dict()
                        print nodegroup_display(node, fbdata, config)
                        i += 1