Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

[plcapi.git] / PLC / Methods / GetNodes.py

diff --git a/PLC/Methods/GetNodes.py b/PLC/Methods/GetNodes.py
index 22b8e01..8e2931a 100644 (file)
--- a/PLC/Methods/GetNodes.py
+++ b/PLC/Methods/GetNodes.py
@@ -3,6 +3,7 @@ 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):
@@ -16,27 +17,63 @@ class GetNodes(Method):
     Some fields may only be viewed by admins.
     """
 
-    roles = ['admin', 'pi', 'user', 'tech']
+    roles = ['admin', 'pi', 'user', 'tech', 'node', 'anonymous']
 
     accepts = [
         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)
+        Parameter([str], "List of fields to return", nullok = True),
         ]
 
     returns = [Node.fields]
 
+
     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 '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'])
+               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