X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FGetNodes.py;h=492187b8f813753976839b66f41c890eeebb234d;hb=9eec67cc51b69f9730379d321e9065d533aa424b;hp=d552bcd8c0a52986d2bed40d7906dbc8829099ac;hpb=1f8c38dd1357c93e4be8d94456b7274a591d2db4;p=plcapi.git

diff --git a/PLC/Methods/GetNodes.py b/PLC/Methods/GetNodes.py
index d552bcd..492187b 100644
--- a/PLC/Methods/GetNodes.py
+++ b/PLC/Methods/GetNodes.py
@@ -1,37 +1,84 @@
+# $Id#
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
+from PLC.Filter import Filter
 from PLC.Nodes import Node, Nodes
+from PLC.Persons import Person, Persons
 from PLC.Auth import Auth
 
 class GetNodes(Method):
     """
-    Return an array of structs containing details about nodes. If
-    node_id_or_hostname_list is specified, only the specified nodes
-    will be queried.
+    Returns an array of structs containing details about nodes. If
+    node_filter is specified and is an array of node identifiers or
+    hostnames, or a struct of node attributes, only nodes matching the
+    filter will be returned. If return_fields is specified, only the
+    specified details will be returned.
 
     Some fields may only be viewed by admins.
     """
 
-    roles = ['admin', 'pi', 'user', 'tech']
+    roles = ['admin', 'pi', 'user', 'tech', 'node', 'anonymous']
 
     accepts = [
         Auth(),
-        [Mixed(Node.fields['node_id'],
-               Node.fields['hostname'])],
+        Mixed([Mixed(Node.fields['node_id'],
+                     Node.fields['hostname'])],
+	      Parameter(str,"hostname"),
+              Parameter(int,"node_id"),
+              Filter(Node.fields)),
+        Parameter([str], "List of fields to return", nullok = True),
         ]
 
     returns = [Node.fields]
 
-    def call(self, auth, node_id_or_hostname_list = None):
-        # Get node information
-        nodes = Nodes(self.api, node_id_or_hostname_list).values()
+
+    def call(self, auth, node_filter = None, return_fields = None):
+        
+	# Must query at least slice_ids_whitelist
+	if return_fields is not None:
+	    added_fields = set(['slice_ids_whitelist', 'site_id']).difference(return_fields)
+	    return_fields += added_fields
+	else:
+	    added_fields =[]	
+
+	# Get node information
+        nodes = Nodes(self.api, node_filter, return_fields)
 
         # Remove admin only fields
-        if 'admin' not in self.caller['roles']:
-            for node in nodes:
-                for field in ['boot_nonce', 'key', 'session', 'root_person_ids']:
+        if not isinstance(self.caller, Person) or \
+           'admin' not in self.caller['roles']:
+	    slice_ids = set()
+	    site_ids = set()
+	    
+	    if self.caller:
+	        slice_ids.update(self.caller['slice_ids'])
+	        if isinstance(self.caller, Node):
+		    site_ids.update([self.caller['site_id']])
+		else:  
+		    site_ids.update(self.caller['site_ids'])
+
+	    # if node has whitelist, only return it if users is at
+	    # the same site or user has a slice on the whitelist 
+            for node in nodes[:]:
+		if 'site_id' in node and \
+		   site_ids.intersection([node['site_id']]):
+		    continue	
+	        if 'slice_ids_whitelist' in node and \
+		   node['slice_ids_whitelist'] and \
+		   not slice_ids.intersection(node['slice_ids_whitelist']):
+	 	    nodes.remove(node)
+
+	    # remove remaining admin only fields
+            for node in nodes:    
+		for field in ['boot_nonce', 'key', 'session', 'root_person_ids']:
                     if field in node:
                         del node[field]
+	
+	# remove added fields if not specified
+	if added_fields:
+	    for node in nodes:
+		for field in added_fields:
+		    del node[field]	
 
         return nodes