X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodeconfig.py;h=6a23fb71f07242c17ab6c4a71b88c791e1ec9b4d;hb=7e1b0434bd1f865f7e9d8dff1cebd87d07a8d65d;hp=fa4a3eb485ad6a724284eadce9dd6e1279fbc60a;hpb=bccc542ed6a8eec74fd6411976cca424a1158c75;p=monitor.git

diff --git a/nodeconfig.py b/nodeconfig.py
index fa4a3eb..6a23fb7 100755
--- a/nodeconfig.py
+++ b/nodeconfig.py
@@ -1,15 +1,13 @@
 #!/usr/bin/python
 
 
-import plc
-import auth
-api = plc.PLC(auth.auth, auth.plc)
+from monitor.wrapper import plc
+api = plc.getAuthAPI()
 
-from optparse import OptionParser
+from monitor import parser as parsermodule
 from sets import Set
 
-from nodecommon import *
-import database
+from monitor.database.info.model import FindbadNodeRecord
 
 def network_config_to_str(net):
 
@@ -22,10 +20,8 @@ def network_config_to_str(net):
 	
 
 def main():
-	from config import config
-	fb = database.dbLoad("findbad")
 
-	parser = OptionParser()
+	parser = parsermodule.getParser()
 	parser.set_defaults(nodelist=None,
 						list=False,
 						add=False,
@@ -34,8 +30,8 @@ def main():
 						)
 	parser.add_option("", "--nodelist", dest="nodelist", metavar="list.txt", 
 						help="Use all nodes in the given file for operation.")
-	config = config(parser)
-	config.parse_args()
+	parser = parsermodule.getParser(['defaults'], parser)
+	config = parsermodule.parse_args(parser)
 
 	# COLLECT nodegroups, nodes and node lists
 	for node in config.args:
@@ -49,7 +45,8 @@ def main():
 			node_keys = ['boot_state', 'key', 'last_updated', 'last_contact']
 			for k in node_keys:
 				if 'last' in k:
-					print "%15s == %s" % (k, diff_time(n[k]))
+					#print "%15s == %s" % (k, diff_time(n[k]))
+					print "%15s == %s" % (k, n[k])
 				else:
 					print "%15s == %s" % (k, n[k])
 
@@ -58,7 +55,9 @@ def main():
 			#for k in net.keys():
 			#	print k, "==" , net[k]
 		except:
+			#from monitor.common import email_exception
 			print "Error with %s" % node
+			#email_exception()
 			import traceback; print traceback.print_exc()
 			pass
 
@@ -69,7 +68,8 @@ def main():
 			i = 1
 			for node in nodelist:
 				print "%-2d" % i, 
-				print nodegroup_display(node, fb)
+				fbdata = FindbadNodeRecord.get_latest_by(hostname=node['hostname'])
+				print nodegroup_display(node, fbdata.to_dict())
 				i += 1
 
 		elif config.add and config.nodegroup: