www/printbadnodes.py

[monitor.git] / sitebad.py

diff --git a/sitebad.py b/sitebad.py
index 6b12ef3..f55a4d3 100755 (executable)
--- a/sitebad.py
+++ b/sitebad.py
@@ -15,7 +15,7 @@ from nodequery import verify,query_to_dict,node_select
 import plc
 api = plc.getAuthAPI()
 from unified_model import *
-from monitor_policy import MINUP
+from const import MINUP
 
 round = 1
 externalState = {'round': round, 'sites': {}}
@@ -119,9 +119,9 @@ def collectStatusAndState(sitename, l_plcsites):
        return True
 
 if __name__ == '__main__':
-       from config import config
-       from optparse import OptionParser
-       parser = OptionParser()
+       import parser as parsermodule
+
+       parser = parsermodule.getParser()
        parser.set_defaults(filename=None, node=None, site=None, nodeselect=False, nodegroup=None, 
                                                increment=False, dbname="sitebad", cachenodes=False)
        parser.add_option("", "--site", dest="site", metavar="login_base", 
@@ -133,8 +133,7 @@ if __name__ == '__main__':
                                                help="Specify the name of the database to which the information is saved")
        parser.add_option("-i", "--increment", action="store_true", dest="increment", 
                                                help="Increment round number to force refresh or retry")
-       config = config(parser)
-       config.parse_args()
+       config = parsermodule.parse_args(parser)
 
        try:
                main(config)