X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodegroups.py;h=999902f2a5c3dff1122627c6530a57a3c90e5293;hb=9cae0ec50c0201aa21dad28413402037816744bd;hp=056f5b8e8fbab43898a87ff2618def7e2bc8967d;hpb=4c9eba6b66e93acca71aae2eacc18d00b38e88fa;p=monitor.git

diff --git a/nodegroups.py b/nodegroups.py
index 056f5b8..999902f 100755
--- a/nodegroups.py
+++ b/nodegroups.py
@@ -59,16 +59,15 @@ 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 = []
 
@@ -76,13 +75,13 @@ def main():
 
 	elif config.nodeselect:
 		hostlist = node_select(config.nodeselect)
-		nodelist = api.GetNodes(hostlist)
+		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 +90,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 ]