better email message

[monitor.git] / nodegroups.py

diff --git a/nodegroups.py b/nodegroups.py
index e96e7b4..d6beb54 100755 (executable)
--- a/nodegroups.py
+++ b/nodegroups.py
@@ -13,18 +13,19 @@
 # Given a nodelist, it could tag each one with a nodegroup name.
 #  * 
 
-import plc
+from monitor import database
+from monitor.database.info.model import FindbadNodeRecord
+from monitor import util
+from monitor.wrapper import plc
+from monitor import parser as parsermodule
+
 api = plc.getAuthAPI()
 
-import parser as parsermodule
-from sets import Set
 from nodequery import verify,query_to_dict,node_select
-
-from nodecommon import *
-import database
+from monitor.common import *
+from sets import Set
 
 def main():
-       fb = database.dbLoad("findbad")
 
        parser = parsermodule.getParser(['nodesets'])
        parser.set_defaults( list=True,
@@ -52,7 +53,7 @@ def main():
                if config.node: 
                        hostlist = [ config.node ] 
                else: 
-                       hostlist = config.getListFromFile(config.nodelist)
+                       hostlist = util.file.getListFromFile(config.nodelist)
 
                # NOTE: preserve order given in file.  Otherwise, return values are not in order
                # given to GetNodes
@@ -120,7 +121,9 @@ def main():
                i = 1
                for node in nodelist:
                        print "%-2d" % i, 
-                       print nodegroup_display(node, fb, config)
+                       fbrec = FindbadNodeRecord.query.filter(FindbadNodeRecord.hostname==node['hostname']).order_by(FindbadNodeRecord.date_checked.desc()).first()
+                       fbdata = fbrec.to_dict()
+                       print nodegroup_display(node, fbdata, config)
                        i += 1
 
        else: