X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodeconfig.py;h=b205900151136910aea023fbd618f99817abec82;hb=1052300e95f159ecded8c1b392c3cb35d2713f51;hp=d69ccfea9d7e08749dedf2238dc0487553bfbadc;hpb=77f84f1e8242cdc45eb091ab65eef940a23493a6;p=monitor.git

diff --git a/nodeconfig.py b/nodeconfig.py
index d69ccfe..b205900 100755
--- a/nodeconfig.py
+++ b/nodeconfig.py
@@ -1,21 +1,29 @@
 #!/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 soltesz
+from monitor import database
+from monitor.database import FindbadNodeRecord
+
+def network_config_to_str(net):
+
+	str = ""
+	static_keys = ['method', 'ip', 'gateway', 'network', 'broadcast', 'netmask', 'dns1', 'dns2', 'mac', 'is_primary']
+	for k in static_keys:
+		str += "%15s == %s\n" % (k, net[k])
+
+	return str
+	
 
 def main():
-	from config import config
-	fb = soltesz.dbLoad("findbad")
 
-	parser = OptionParser()
+	parser = parsermodule.getParser()
 	parser.set_defaults(nodelist=None,
 						list=False,
 						add=False,
@@ -24,8 +32,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:
@@ -43,9 +51,7 @@ def main():
 				else:
 					print "%15s == %s" % (k, n[k])
 
-			static_keys = ['method', 'ip', 'gateway', 'network', 'broadcast', 'netmask', 'dns1', 'dns2', 'mac', 'is_primary']
-			for k in static_keys:
-				print "%15s == %s" % (k, net[k])
+			print network_config_to_str(net)
 
 			#for k in net.keys():
 			#	print k, "==" , net[k]
@@ -61,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: