X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=printbadcsv.py;h=2f5036da874759b3920c6b00c1da4bd33ac7ac05;hb=08bc8fdd4fc58fd7db356b0e5ba981d975231b78;hp=0d6ccec3783ebff7bc478b6b51fef2aa6f7e80d4;hpb=6496f5b4a0220e4055fee76c97f92293f9559117;p=monitor.git

diff --git a/printbadcsv.py b/printbadcsv.py
index 0d6ccec..2f5036d 100755
--- a/printbadcsv.py
+++ b/printbadcsv.py
@@ -1,13 +1,12 @@
 #!/usr/bin/python
-import database
-from config import config
-from optparse import OptionParser
+from monitor import database
+from monitor import config
+import parser as parsermodule
+
 from www.printbadnodes import *
 
 def main():
-	global fb
 	db = database.dbLoad(config.dbname)
-	fb = database.dbLoad("findbadpcus")
 	act= database.dbLoad("act_all")
 
 	## Field widths used for printing
@@ -116,19 +115,19 @@ def main():
 			print str
 
 	keys = categories.keys()
-	for cat in ['BOOT-ALPHA', 'BOOT-PROD', 'BOOT-OLDBOOTCD', 'DEBUG-ALPHA',
-	'DEBUG-PROD', 'DEBUG-OLDBOOTCD', 'DOWN-ERROR']:
+	for cat in ['BOOT-PROD', 'BOOT-OLDPROD', 'BOOT-OLDBOOTCD', 'DEBUG-PROD',
+	'DEBUG-OLDPROD', 'DEBUG-OLDBOOTCD', 'DOWN-ERROR']:
 		if cat not in keys:
 			categories[cat] = 0
 	keys = categories.keys()
-	for cat in ['BOOT-ALPHA', 'BOOT-PROD', 'BOOT-OLDBOOTCD', 'DEBUG-ALPHA',
-	'DEBUG-PROD', 'DEBUG-OLDBOOTCD', 'DOWN-ERROR']:
+	for cat in ['BOOT-PROD', 'BOOT-OLDPROD', 'BOOT-OLDBOOTCD', 'DEBUG-PROD',
+	'DEBUG-OLDPROD', 'DEBUG-OLDBOOTCD', 'DOWN-ERROR']:
 		if cat in keys:
 			print "%d," % categories[cat],
 	print ""
 import cgi
 if __name__ == '__main__':
-	parser = OptionParser()
+	parser = parsermodule.getParser()
 	parser.set_defaults(cmpdays=False, 
 						comon="sshstatus", 
 						fields="nodename,ping,ssh,pcu,category,state,kernel,bootcd,rt", 
@@ -148,6 +147,5 @@ if __name__ == '__main__':
 	parser.add_option("", "--kernel",	dest="cmpkernel", action="store_true", help="")
 	parser.add_option("", "--state",	dest="cmpstate", action="store_true", help="")
 	parser.add_option("", "--comon",	dest="comon", 	help="")
-	config = config(parser)
-	config.parse_args()
+	config = parsermodule.parse_args(parser)
 	main()