This commit was manufactured by cvs2svn to create branch

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

diff --git a/PLC/Methods/GetNodes.py b/PLC/Methods/GetNodes.py
index 937b948..d308a4f 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,7 +17,7 @@ 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(),
@@ -24,17 +25,18 @@ class GetNodes(Method):
                      Node.fields['hostname'])],
               Filter(Node.fields)),
         Parameter([str], "List of fields to return", nullok = True),
-        Parameter(str,"scope string, can be either 'all', 'local' or 'foreign'"),
         ]
 
     returns = [Node.fields]
 
-    def call(self, auth, node_filter = None, return_fields = None, scope = 'all'):
+
+    def call(self, auth, node_filter = None, return_fields = None):
         # Get node information
-        nodes = Nodes(self.api, node_filter, return_fields, scope)
+        nodes = Nodes(self.api, node_filter, return_fields)
 
         # Remove admin only fields
-        if 'admin' not in self.caller['roles']:
+        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']:
                     if field in node: