X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FGetNodes.py;h=8e2931a1f424909039a500059c3a6cfd26500577;hb=refs%2Fheads%2Fplanetlab-4_0-branch;hp=d308a4f43e2e2de3a50ae1a584c03f50c571c8ed;hpb=03f03eb21ef66571e98d61c0b0c56bdb861062a7;p=plcapi.git

diff --git a/PLC/Methods/GetNodes.py b/PLC/Methods/GetNodes.py
index d308a4f..8e2931a 100644
--- a/PLC/Methods/GetNodes.py
+++ b/PLC/Methods/GetNodes.py
@@ -23,6 +23,8 @@ class GetNodes(Method):
         Auth(),
         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),
         ]
@@ -31,15 +33,47 @@ class GetNodes(Method):
 
 
     def call(self, auth, node_filter = None, return_fields = None):
-        # Get node information
+        
+	# 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 not isinstance(self.caller, Person) or \
            'admin' not in self.caller['roles']:
-            for node in nodes:
-                for field in ['boot_nonce', 'key', 'session', 'root_person_ids']:
+	    slice_ids = set()
+	    site_ids = set()
+	    if self.caller:
+	        slice_ids.update(self.caller['slice_ids'])
+		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