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

diff --git a/nodeconfig.py b/nodeconfig.py
index 2327ec0..b205900 100755
--- a/nodeconfig.py
+++ b/nodeconfig.py
@@ -1,14 +1,15 @@
 #!/usr/bin/python
 
 
-import plc
+from monitor.wrapper import plc
 api = plc.getAuthAPI()
 
-import parser as parsermodule
+from monitor import parser as parsermodule
 from sets import Set
 
 from nodecommon import *
-import database
+from monitor import database
+from monitor.database import FindbadNodeRecord
 
 def network_config_to_str(net):
 
@@ -21,7 +22,6 @@ def network_config_to_str(net):
 	
 
 def main():
-	fb = database.dbLoad("findbad")
 
 	parser = parsermodule.getParser()
 	parser.set_defaults(nodelist=None,
@@ -67,7 +67,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: