From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 28 Sep 2012 00:26:19 +0000 (-0400)
Subject: remove node role, remove return value filtering
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=307404376e08d96652c93f9c140f3a86d1695075;p=plcapi.git

remove node role, remove return value filtering
---

diff --git a/PLC/Methods/GetSlices.py b/PLC/Methods/GetSlices.py
index c06fbe29..086a12bc 100644
--- a/PLC/Methods/GetSlices.py
+++ b/PLC/Methods/GetSlices.py
@@ -21,7 +21,7 @@ class GetSlices(Method):
     slice_filter, details about that slice will not be returned.
     """
 
-    roles = ['admin', 'pi', 'user', 'node']
+    roles = ['admin', 'pi', 'user']
 
     accepts = [
         Auth(),
@@ -59,13 +59,6 @@ class GetSlices(Method):
             if slice_filter is None:
                 slice_filter = valid_slice_ids
 
-        # Must query at least slice_id (see below)
-        if return_fields is not None and 'slice_id' not in return_fields:
-            return_fields.append('slice_id')
-            added_fields = True
-        else:
-            added_fields = False
-
         slices = Slices(self.api, slice_filter, return_fields)
 
         # Filter out slices that are not viewable
@@ -73,10 +66,4 @@ class GetSlices(Method):
            'admin' not in self.caller['roles']:
             slices = filter(lambda slice: slice['slice_id'] in valid_slice_ids, slices)
 
-        # Remove slice_id if not specified
-        if added_fields:
-            for slice in slices:
-                if 'slice_id' in slice:
-                    del slice['slice_id']
-
         return slices