X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodeconfig.py;h=bb661762998acc0ac7386e87bf21715aa709036a;hb=36b3183046a4c77cda147b440c6e85d1a036f239;hp=b205900151136910aea023fbd618f99817abec82;hpb=90b2e8e7cb145cb1f6b3780867617084441b6ca9;p=monitor.git

diff --git a/nodeconfig.py b/nodeconfig.py
index b205900..bb66176 100755
--- a/nodeconfig.py
+++ b/nodeconfig.py
@@ -7,9 +7,7 @@ api = plc.getAuthAPI()
 from monitor import parser as parsermodule
 from sets import Set
 
-from nodecommon import *
-from monitor import database
-from monitor.database import FindbadNodeRecord
+from monitor.database.info.model import FindbadNodeRecord
 
 def network_config_to_str(net):
 
@@ -41,13 +39,14 @@ def main():
 		try:
 			n = api.GetNodes(node)[0]
 			#print n
-			net = api.GetNodeNetworks(n['nodenetwork_ids'])[0]
+			net = api.GetInterfaces(n['interface_ids'])[0]
 			#print net
 
 			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])
 
@@ -56,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