X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodediff.py;h=933ddc68bb5fe7e7b21f016096a9f2a4d8e190c4;hb=08bc8fdd4fc58fd7db356b0e5ba981d975231b78;hp=76db4281ac197a57a59968a5cde6523249bb4849;hpb=d5b0651a666c9a6b2deb4103ed15c3c06075395d;p=monitor.git

diff --git a/nodediff.py b/nodediff.py
index 76db428..933ddc6 100644
--- a/nodediff.py
+++ b/nodediff.py
@@ -1,13 +1,13 @@
 #!/usr/bin/python
 
 import sys
-import soltesz
-
-from config import config as cfg
+import database
+import config
+import parser as parsermodule
 
 def nodes_from_time(time_str):
 	path = "archive-pdb"
-	archive = soltesz.SPickle(path)
+	archive = database.SPickle(path)
 	d = datetime_fromstr(config.fromtime)
 	glob_str = "%s*.production.findbad.pkl" % d.strftime("%Y-%m-%d")
 	os.chdir(path)
@@ -22,13 +22,13 @@ def nodes_from_time(time_str):
 	
 
 def main():
-	parser = OptionParser()
+	parser = parsermodule.getParser()
 	parser.set_defaults(nodeselect=None,)
 	parser.add_option("", "--nodeselect", dest="nodeselect", metavar="state=BOOT", 
 						help="""Query on the nodes to count""")
 
-	config = cfg(parser)
-	config.parse_args()
+	parser = parsermodule.getParser(['defaults'], parser)
+	cfg = parsermodule.parse_args(parser)
 
 	time1 = config.args[0]
 	time2 = config.args[1]