take out of repository.

[monitor.git] / nodequery.py

diff --git a/nodequery.py b/nodequery.py
index 28cedb2..a982e20 100755 (executable)
--- a/nodequery.py
+++ b/nodequery.py
@@ -1,11 +1,10 @@
 #!/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
 import glob
@@ -16,7 +15,7 @@ import time
 import re
 
 #fb = {}
-fb = soltesz.dbLoad("findbad")
+fb = database.dbLoad("findbad")
 fbpcu = {}
 
 class NoKeyException(Exception): pass
@@ -264,7 +263,7 @@ def main():
        
        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,9 +273,9 @@ 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")
 
        if config.nodelist:
                nodelist = config.getListFromFile(config.nodelist)