changes for 3.0

[monitor.git] / getnodes.py

diff --git a/getnodes.py b/getnodes.py
index 60dad7c..7be8a0e 100755 (executable)
--- a/getnodes.py
+++ b/getnodes.py
@@ -1,23 +1,19 @@
 #!/usr/bin/python
 
-import soltesz
+import database
 import plc
-from optparse import OptionParser
 import sys
 from reboot import pcu_name, get_pcu_values
 
 import sys
-from config import config
+import parser as parsermodule
 
-parser = OptionParser()
+parser = parsermodule.getParser()
 parser.set_defaults(withpcu=False,
                                        refresh=False)
 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()
@@ -27,7 +23,7 @@ if not config.run:
        print "Add --run to actually perform the command"
        sys.exit(1)
 
-nodelist = soltesz.if_cached_else_refresh(1, 
+nodelist = database.if_cached_else_refresh(1, 
                                                        config.refresh, 
                                                        "l_plcnodes", 
                                                        lambda : plc.getNodes({'peer_id':None}, ['hostname']))