changes for 3.0

[monitor.git] / pcuinfo.py

diff --git a/pcuinfo.py b/pcuinfo.py
index 3c61cd1..d6d5e87 100755 (executable)
--- a/pcuinfo.py
+++ b/pcuinfo.py
@@ -1,19 +1,18 @@
 #!/usr/bin/python
 
-import soltesz
+import database
 import plc
-from optparse import OptionParser
+import parser as parsermodule
 import sys
 from reboot import pcu_name, get_pcu_values
 
 import sys
-from config import config
 
 def print_dict(dict):
        for key in dict.keys():
                print "%30s : %s" % (key, dict[key])
 
-parser = OptionParser()
+parser = parsermodule.getParser()
 parser.set_defaults(withpcu=False,
                                        refresh=False)
 parser.add_option("-f", "--nodelist",dest="filename",default="", metavar="FILE",
@@ -21,9 +20,7 @@ parser.add_option("-f", "--nodelist",dest="filename",default="", metavar="FILE",
 parser.add_option("", "--refresh", action="store_true", dest="refresh",
                                        help="Refresh the cached values")
 
-
-config = config(parser)
-config.parse_args()
+config = parsermodule.parse_args(parser)
 
 if not config.run:
        k = config.__dict__.keys()
@@ -33,7 +30,7 @@ if not config.run:
        print "Add --run to actually perform the command"
        sys.exit(1)
 
-pculist = soltesz.if_cached_else_refresh(1, 
+pculist = database.if_cached_else_refresh(1, 
                                                        config.refresh, 
                                                        "pculist", 
                                                        lambda : plc.GetPCUs())
@@ -54,4 +51,4 @@ for pcu in pculist:
                if values['reboot'] == 0:
                        print "%6d %20s %50s %s" % (pcu['pcu_id'], pcu['password'], "%s@%s" % (pcu['username'], host), portstatus)
 
-#soltesz.dbDump("pculist", pculist, 'php')
+#database.dbDump("pculist", pculist, 'php')