X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=getnodes.py;h=7be8a0e9d69f93f8ec4f25dd1031f1a5ea0f893a;hb=refs%2Fheads%2F1.0;hp=60dad7c84adad910342466ca9da60364be80da5f;hpb=8b0bb120a071aa27951eb0bf9435aadd9e1df9ed;p=monitor.git

diff --git a/getnodes.py b/getnodes.py
index 60dad7c..7be8a0e 100755
--- 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']))