- Change .py files to use 4-space indents and no hard tab characters.

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

diff --git a/PLC/Methods/GetPCUs.py b/PLC/Methods/GetPCUs.py
index 1f8e201..298094c 100644 (file)
--- a/PLC/Methods/GetPCUs.py
+++ b/PLC/Methods/GetPCUs.py
@@ -1,7 +1,12 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Filter import Filter
+from PLC.Sites import Site, Sites
+from PLC.Persons import Person, Persons
+from PLC.Nodes import Node, Nodes
 from PLC.PCUs import PCU, PCUs
 from PLC.Auth import Auth
 
@@ -17,7 +22,7 @@ class GetPCUs(Method):
     their sites.
     """
 
-    roles = ['admin', 'pi', 'tech']
+    roles = ['admin', 'pi', 'tech', 'node']
 
     accepts = [
         Auth(),
@@ -27,18 +32,20 @@ class GetPCUs(Method):
         ]
 
     returns = [PCU.fields]
-    event_type = 'Get'
-    object_type = 'PCU'
 
     def call(self, auth, pcu_filter = None, return_fields = None):
-       # If we are not admin, make sure to only return our own PCUs
-        if 'admin' not in self.caller['roles']:
-            # Get list of PCUs that we are able to view
+        # If we are not admin
+        if not (isinstance(self.caller, Person) and 'admin' in self.caller['roles']):
+            # Return only the PCUs at our site
             valid_pcu_ids = []
-            if self.caller['site_ids']:
-                sites = Sites(self.api, self.caller['site_ids'])
-                for site in sites:
-                    valid_pcu_ids += site['pcu_ids']
+
+            if isinstance(self.caller, Person):
+                site_ids = self.caller['site_ids']
+            elif isinstance(self.caller, Node):
+                site_ids = [self.caller['site_id']]
+
+            for site in Sites(self.api, site_ids):
+                valid_pcu_ids += site['pcu_ids']
 
             if not valid_pcu_ids:
                 return []
@@ -46,10 +53,23 @@ class GetPCUs(Method):
             if pcu_filter is None:
                 pcu_filter = valid_pcu_ids
 
+        # Must query at least slice_id (see below)
+        if return_fields is not None and 'pcu_id' not in return_fields:
+            return_fields.append('pcu_id')
+            added_fields = True
+        else:
+            added_fields = False
+
         pcus = PCUs(self.api, pcu_filter, return_fields)
 
         # Filter out PCUs that are not viewable
-        if 'admin' not in self.caller['roles']:
+        if not (isinstance(self.caller, Person) and 'admin' in self.caller['roles']):
             pcus = filter(lambda pcu: pcu['pcu_id'] in valid_pcu_ids, pcus)
 
+        # Remove pcu_id if not specified
+        if added_fields:
+            for pcu in pcus:
+                if 'pcu_id' in pcu:
+                    del pcu['pcu_id']
+
         return pcus