X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodegroups.py;h=ecb9c08125bdde6c0422793a093e493952c51816;hb=a1d795311ad8facac7399e73123d53e6c8e72c9d;hp=9e14e2f0a5f2dc6ffe4df631f69f048555a33aee;hpb=90b2e8e7cb145cb1f6b3780867617084441b6ca9;p=monitor.git

diff --git a/nodegroups.py b/nodegroups.py
index 9e14e2f..ecb9c08 100755
--- a/nodegroups.py
+++ b/nodegroups.py
@@ -14,15 +14,14 @@
 #  * 
 
 from monitor import database
-from monitor.database import FindbadNodeRecord
+from monitor.database.info.model import FindbadNodeRecord
 from monitor import util
 from monitor.wrapper import plc
 from monitor import parser as parsermodule
 
 api = plc.getAuthAPI()
 
-from nodequery import verify,query_to_dict,node_select
-from nodecommon import *
+from monitor.common import *
 from sets import Set
 
 def main():
@@ -59,30 +58,29 @@ def main():
 		# given to GetNodes
 		nodelist = []
 		for h in hostlist:
-			nodelist += api.GetNodes(h)
+			nodelist.append( plccache.GetNodeByName(h) )
 
-		#nodelist = api.GetNodes(hostlist)
 		group_str = "Given"
 
 	elif config.site:
-		site = api.GetSites(config.site)
+		site = plccache.GetSitesByName([config.site])
 		if len (site) > 0:
 			site = site[0]
-			nodelist = api.GetNodes(site['node_ids'])
+			nodelist = plccache.GetNodesByIds(site['node_ids'])
 		else:
 			nodelist = []
 
 		group_str = config.site
 
 	elif config.nodeselect:
-		hostlist = node_select(config.nodeselect)
-		nodelist = api.GetNodes(hostlist)
+		hostlist = query.node_select(config.nodeselect)
+		nodelist = [ plccache.GetNodeByName(h) for h in hostlist ]
 
 		group_str = "selection"
 		
 	else:
 		ng = api.GetNodeGroups({'name' : config.nodegroup})
-		nodelist = api.GetNodes(ng[0]['node_ids'])
+		nodelist = plccache.GetNodesByIds(ng[0]['node_ids'])
 
 		group_str = config.nodegroup
 
@@ -91,7 +89,7 @@ def main():
 		ng_nodes = nodelist
 
 		# Get all nodes
-		all_nodes = api.GetNodes({'peer_id': None})
+		all_nodes = plccache.l_nodes
 		
 		# remove ngnodes from all node list
 		ng_list = [ x['hostname'] for x in ng_nodes ]
@@ -121,7 +119,7 @@ def main():
 		i = 1
 		for node in nodelist:
 			print "%-2d" % i, 
-			fbrec = FindbadNodeRecord.query.filter(FindbadNodeRecord.hostname==node['hostname']).order_by(FindbadNodeRecord.date_checked.desc()).first()
+			fbrec = FindbadNodeRecord.get_latest_by(hostname=node['hostname'])
 			fbdata = fbrec.to_dict()
 			print nodegroup_display(node, fbdata, config)
 			i += 1