www/printbadnodes.py

[monitor.git] / nodequery.py

diff --git a/nodequery.py b/nodequery.py
index 28cedb2..c3f7ab8 100755 (executable)
--- a/nodequery.py
+++ b/nodequery.py
@@ -1,30 +1,32 @@
 #!/usr/bin/python
 
 import plc
-import auth
-api = plc.PLC(auth.auth, auth.plc)
+api = plc.getAuthAPI()
 
 import sys
-import soltesz
+import database
 from nodecommon import *
-from policy import Diagnose
+#from policy import Diagnose
+from unified_model import Record
 import glob
 import os
 from reboot import pcu_name
+import reboot
+import util.file
 
 import time
 import re
 
 #fb = {}
-fb = soltesz.dbLoad("findbad")
+fb = {}
 fbpcu = {}
 
 class NoKeyException(Exception): pass
 
 def daysdown_print_nodeinfo(fbnode, hostname):
        fbnode['hostname'] = hostname
-       fbnode['daysdown'] = Diagnose.getStrDaysDown(fbnode)
-       fbnode['intdaysdown'] = Diagnose.getDaysDown(fbnode)
+       fbnode['daysdown'] = Record.getStrDaysDown(fbnode)
+       fbnode['intdaysdown'] = Record.getDaysDown(fbnode)
 
        print "%(intdaysdown)5s %(hostname)-44s | %(state)10.10s | %(daysdown)s" % fbnode
 
@@ -201,13 +203,14 @@ def pcu_select(str_query, nodelist=None):
        return (nodenames, pcunames)
 
 def node_select(str_query, nodelist=None, fbdb=None):
+       global fb
+
        hostnames = []
        if str_query is None: return hostnames
 
        #print str_query
        dict_query = query_to_dict(str_query)
        #print dict_query
-       global fb
 
        if fbdb is not None:
                fb = fbdb
@@ -241,10 +244,11 @@ def main():
        global fb
        global fbpcu
 
-       from config import config
-       from optparse import OptionParser
-       parser = OptionParser()
-       parser.set_defaults(node=None, fromtime=None, select=None, list=None, pcuselect=None, nodelist=None, daysdown=None, fields=None)
+       import parser as parsermodule
+       parser = parsermodule.getParser()
+
+       parser.set_defaults(node=None, fromtime=None, select=None, list=None, 
+                                               pcuselect=None, nodelist=None, daysdown=None, fields=None)
        parser.add_option("", "--daysdown", dest="daysdown", action="store_true",
                                                help="List the node state and days down...")
        parser.add_option("", "--select", dest="select", metavar="key=value", 
@@ -259,12 +263,13 @@ def main():
                                                help="A list of nodes to bring out of debug mode.")
        parser.add_option("", "--fromtime", dest="fromtime", metavar="YYYY-MM-DD",
                                        help="Specify a starting date from which to begin the query.")
-       config = config(parser)
-       config.parse_args()
+
+       parser = parsermodule.getParser(['defaults'], parser)
+       config = parsermodule.parse_args(parser)
        
        if config.fromtime:
                path = "archive-pdb"
-               archive = soltesz.SPickle(path)
+               archive = database.SPickle(path)
                d = datetime_fromstr(config.fromtime)
                glob_str = "%s*.production.findbad.pkl" % d.strftime("%Y-%m-%d")
                os.chdir(path)
@@ -274,25 +279,25 @@ def main():
                os.chdir("..")
                fb = archive.load(file[:-4])
        else:
-               fb = soltesz.dbLoad("findbad")
+               fb = database.dbLoad("findbad")
 
-       fbpcu = soltesz.dbLoad("findbadpcus")
+       fbpcu = database.dbLoad("findbadpcus")
+       reboot.fb = fbpcu
 
        if config.nodelist:
-               nodelist = config.getListFromFile(config.nodelist)
+               nodelist = util.file.getListFromFile(config.nodelist)
        else:
                nodelist = fb['nodes'].keys()
 
        pculist = None
        if config.select is not None and config.pcuselect is not None:
-               nodelist = node_select(config.select, nodelist)
+               nodelist = node_select(config.select, nodelist, fb)
                nodelist, pculist = pcu_select(config.pcuselect, nodelist)
        elif config.select is not None:
-               nodelist = node_select(config.select, nodelist)
+               nodelist = node_select(config.select, nodelist, fb)
        elif config.pcuselect is not None:
                nodelist, pculist = pcu_select(config.pcuselect, nodelist)
 
-
        if pculist:
                for pcu in pculist:
                        print pcu