X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pcubad.py;h=008ecd8090d5181c61b41652668dc7d9c16401ba;hb=refs%2Fheads%2F1.0;hp=5b718456535caae44c06246c9e0602b8d4fadd7f;hpb=6496f5b4a0220e4055fee76c97f92293f9559117;p=monitor.git

diff --git a/pcubad.py b/pcubad.py
index 5b71845..008ecd8 100755
--- a/pcubad.py
+++ b/pcubad.py
@@ -12,12 +12,13 @@ import comon
 import threadpool
 import syncplcdb
 from nodequery import verify,query_to_dict,node_select
+import parser as parsermodule
+from nodecommon import *
 
 import plc
-import auth
-api = plc.PLC(auth.auth, auth.plc)
+api = plc.getAuthAPI()
 from unified_model import *
-from monitor_policy import MINUP
+from const import MINUP
 
 round = 1
 externalState = {'round': round, 'nodes': {}}
@@ -135,9 +136,7 @@ def collectStatusAndState(pcuname, l_plcpcus):
 	return True
 
 if __name__ == '__main__':
-	from config import config
-	from optparse import OptionParser
-	parser = OptionParser()
+	parser = parsermodule.getParser()
 	parser.set_defaults(filename=None, pcu=None, pcuselect=False, pcugroup=None, 
 						increment=False, dbname="pcubad", cachepcus=False)
 	parser.add_option("", "--pcu", dest="pcu", metavar="hostname", 
@@ -149,14 +148,15 @@ if __name__ == '__main__':
 						help="Specify the name of the database to which the information is saved")
 	parser.add_option("-i", "--increment", action="store_true", dest="increment", 
 						help="Increment round number to force refresh or retry")
-	config = config(parser)
-	config.parse_args()
+	config = parsermodule.parse_args(parser)
 
 	try:
 		main(config)
 	except Exception, err:
 		import traceback
 		print traceback.print_exc()
+		from nodecommon import email_exception
+		email_exception()
 		print "Exception: %s" % err
 		print "Saving data... exitting."
 		database.dbDump(config.dbname, externalState)