X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pcuinfo.py;h=c9d1e90b07aad7edf9164c8c06f378efc7d06e63;hb=311f1adfd6750378d80e4c8c7eb2a8a251d4ce7e;hp=20f9895ab7660d8709e648cbf077333b8249ed99;hpb=6496f5b4a0220e4055fee76c97f92293f9559117;p=monitor.git

diff --git a/pcuinfo.py b/pcuinfo.py
index 20f9895..c9d1e90 100755
--- a/pcuinfo.py
+++ b/pcuinfo.py
@@ -2,18 +2,17 @@
 
 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,10 +30,10 @@ if not config.run:
 	print "Add --run to actually perform the command"
 	sys.exit(1)
 
-pculist = database.if_cached_else_refresh(1, 
-							config.refresh, 
-							"pculist", 
-							lambda : plc.GetPCUs())
+pculist = plccache.l_pcus # database.if_cached_else_refresh(1, 
+						  #	config.refresh, 
+						  #	"pculist", 
+						  #	lambda : plc.GetPCUs())
 for pcu in pculist:
 	#print pcu
 	#sys.exit(1)