From 4a6dac6956e61ff4f44a8238302540e3c06b0f0d Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Tue, 27 Jul 2010 10:38:58 -0400 Subject: [PATCH] Removed access policies from GetSlices, they are now in the Slices table --- PLC/Methods/GetSlices.py | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/PLC/Methods/GetSlices.py b/PLC/Methods/GetSlices.py index 22e5e1e2..a9cf2676 100644 --- a/PLC/Methods/GetSlices.py +++ b/PLC/Methods/GetSlices.py @@ -37,41 +37,5 @@ class GetSlices(Method): returns = [Slice.fields] def call(self, auth, slice_filter = None, return_fields = None): - # If we are not admin, make sure to return only viewable - # slices. - if isinstance(self.caller, Person) and \ - 'admin' not in self.caller['roles']: - # Get slices that we are able to view - valid_slice_ids = self.caller['slice_ids'] - if 'pi' in self.caller['roles'] and self.caller['site_ids']: - sites = Sites(self.api, self.caller['site_ids']) - for site in sites: - valid_slice_ids += site['slice_ids'] - - if not valid_slice_ids: - return [] - - 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 - if isinstance(self.caller, Person) and \ - '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.47.0