From b61dc696e6c6a0f67565724b4bb7eb466397aa42 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 16 Jan 2007 22:41:49 +0000 Subject: [PATCH] - call GetSlices --- PLC/Methods/SliceListNames.py | 21 ++++----------------- PLC/Methods/SliceListUserSlices.py | 6 ++++-- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/PLC/Methods/SliceListNames.py b/PLC/Methods/SliceListNames.py index 0e45887..b046e9c 100644 --- a/PLC/Methods/SliceListNames.py +++ b/PLC/Methods/SliceListNames.py @@ -3,8 +3,9 @@ from PLC.Parameter import Parameter, Mixed from PLC.Filter import Filter from PLC.Auth import Auth from PLC.Slices import Slice, Slices +from PLC.Methods.GetSlices import GetSlices -class SliceListNames(Method): +class SliceListNames(GetSlices): """ Deprecated. Can be implemented with GetSlices. @@ -32,25 +33,11 @@ class SliceListNames(Method): if prefix: slice_filter = {'name': prefix+'*'} - slices = Slices(self.api, slice_filter) + slices = GetSlices.call(self, auth, slice_filter) + if not slices: raise PLCInvalidArgument, "No such slice" - # If we are not admin, make sure to return only viewable - # slices. - if '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 [] - - slices = filter(lambda slice: slice['slice_id'] in valid_slice_ids, slices) - slice_names = [slice['name'] for slice in slices] return slice_names diff --git a/PLC/Methods/SliceListUserSlices.py b/PLC/Methods/SliceListUserSlices.py index 86f9778..580e97b 100644 --- a/PLC/Methods/SliceListUserSlices.py +++ b/PLC/Methods/SliceListUserSlices.py @@ -4,8 +4,9 @@ from PLC.Filter import Filter from PLC.Auth import Auth from PLC.Slices import Slice, Slices from PLC.Persons import Person, Persons +from PLC.Methods.GetSlices import GetSlices -class SliceListUserSlices(Method): +class SliceListUserSlices(GetSlices): """ Deprecated. Can be implemented with GetPersons. @@ -36,7 +37,8 @@ class SliceListUserSlices(Method): slice_ids = person['slice_ids'] if not slice_ids: return [] - slices = Slices(self.api, slice_ids) + + slices = GetSlices.call(self, auth, slice_ids) slice_names = [slice['name'] for slice in slices] return slice_names -- 2.43.0