From 307404376e08d96652c93f9c140f3a86d1695075 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 27 Sep 2012 20:26:19 -0400 Subject: [PATCH] remove node role, remove return value filtering --- PLC/Methods/GetSlices.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/PLC/Methods/GetSlices.py b/PLC/Methods/GetSlices.py index c06fbe2..086a12b 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 -- 2.43.0