fix bug that prevented penalty escallation from occurring.

[monitor.git] / siteinfo.py

diff --git a/siteinfo.py b/siteinfo.py
index 10c42ef..e9dc9d5 100755 (executable)
--- a/siteinfo.py
+++ b/siteinfo.py
@@ -1,22 +1,21 @@
 #!/usr/bin/python
 
 import plc
-import auth
-api = plc.PLC(auth.auth, auth.plc)
+api = plc.getAuthAPI()
 
-import soltesz
+import database
 import reboot
 
 import time
 from model import *
 from nodecommon import *
 
-import config as configmodule
+import util.file
 
-from config import config as cfg
-from optparse import OptionParser
+import parser as parsermodule
 
-parser = OptionParser()
+
+parser = parsermodule.getParser()
 parser.set_defaults(site=None, 
                                        findbad=False,
                                        enable=False,
@@ -30,8 +29,7 @@ parser.add_option("", "--enable", dest="enable", action="store_true",
                                        help="")
 parser.add_option("", "--disable", dest="disable", action="store_true",
                                        help="")
-config = cfg(parser)
-config.parse_args()
+config = parsermodule.parse_args(parser)
 
 from unified_model import *
 def color_sitestatus(status):
@@ -79,8 +77,8 @@ def plc_print_siteinfo(plcsite):
                diff_time(plcnode['last_contact']))
 
 
-fb = soltesz.dbLoad("findbad")
-act_all = soltesz.dbLoad("act_all")
+fb = database.dbLoad("findbad")
+act_all = database.dbLoad("act_all")
 
 for site in config.args:
        config.site = site
@@ -95,7 +93,7 @@ for site in config.args:
                file = "findbad.txt"
                nodes = api.GetNodes(plc_siteinfo['node_ids'], ['hostname'])
                nodes = [ n['hostname'] for n in nodes ]
-               configmodule.setFileFromList(file, nodes)
+               util.file.setFileFromList(file, nodes)
                os.system("./findbad.py --cachenodes --debug=0 --dbname=findbad --increment --nodelist %s" % file)
 
        print "%(login_base)s %(url)s" % plc_siteinfo