X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodegroups.py;h=9e14e2f0a5f2dc6ffe4df631f69f048555a33aee;hb=f9da3f16b608452f4166050e93044fbb20fc5e6d;hp=207efaed50fb640c67e8abe76a6d1855fa593444;hpb=6496f5b4a0220e4055fee76c97f92293f9559117;p=monitor.git

diff --git a/nodegroups.py b/nodegroups.py
index 207efae..9e14e2f 100755
--- a/nodegroups.py
+++ b/nodegroups.py
@@ -13,41 +13,29 @@
 # Given a nodelist, it could tag each one with a nodegroup name.
 #  * 
 
-import plc
-import auth
-api = plc.PLC(auth.auth, auth.plc)
+from monitor import database
+from monitor.database import FindbadNodeRecord
+from monitor import util
+from monitor.wrapper import plc
+from monitor import parser as parsermodule
 
-from optparse import OptionParser
-from sets import Set
-from nodequery import verify,query_to_dict,node_select
+api = plc.getAuthAPI()
 
+from nodequery import verify,query_to_dict,node_select
 from nodecommon import *
-import database
+from sets import Set
 
 def main():
-	from config import config
-	fb = database.dbLoad("findbad")
-
-	parser = OptionParser()
-	parser.set_defaults(nodegroup="Alpha",
-						node=None,
-						nodelist=None,
-						list=True,
+
+	parser = parsermodule.getParser(['nodesets'])
+	parser.set_defaults( list=True,
 						add=False,
                         nocolor=False,
 						notng=False,
-						delete=False,
-						nodeselect=None,
-						)
+						delete=False,)
+
 	parser.add_option("", "--not", dest="notng", action="store_true", 
 						help="All nodes NOT in nodegroup.")
-	parser.add_option("", "--nodegroup", dest="nodegroup", metavar="NodegroupName",
-						help="Specify a nodegroup to perform actions on")
-	parser.add_option("", "--nodeselect", dest="nodeselect", metavar="querystring",
-						help="Specify a query to perform on findbad db")
-	parser.add_option("", "--site", dest="site", metavar="site name",
-						help="Specify a site to view node status")
-
 	parser.add_option("", "--nocolor", dest="nocolor", action="store_true", 
 						help="Enable color")
 	parser.add_option("", "--list", dest="list", action="store_true", 
@@ -56,19 +44,16 @@ def main():
 						help="Add nodes to the given nodegroup")
 	parser.add_option("", "--delete", dest="delete", action="store_true", 
 						help="Delete nodes from the given nodegroup")
-	parser.add_option("", "--node", dest="node", metavar="nodename.edu", 
-						help="A single node name to add to the nodegroup")
-	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
 	if config.node or config.nodelist:
 		if config.node: 
 			hostlist = [ config.node ] 
 		else: 
-			hostlist = config.getListFromFile(config.nodelist)
+			hostlist = util.file.getListFromFile(config.nodelist)
 
 		# NOTE: preserve order given in file.  Otherwise, return values are not in order
 		# given to GetNodes
@@ -132,10 +117,13 @@ def main():
 
 	elif config.list:
 		print " ---- Nodes in the %s Node Group ----" % group_str
+		print "   Hostname                                   plc  obs     pcu     key         kernel                        last_contact, last change, comon uptime"
 		i = 1
 		for node in nodelist:
 			print "%-2d" % i, 
-			print nodegroup_display(node, fb, config)
+			fbrec = FindbadNodeRecord.query.filter(FindbadNodeRecord.hostname==node['hostname']).order_by(FindbadNodeRecord.date_checked.desc()).first()
+			fbdata = fbrec.to_dict()
+			print nodegroup_display(node, fbdata, config)
 			i += 1
 
 	else: