X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FGetSlices.py;h=c06fbe297ded8bb46b8e255e76cf7b6be0a65d20;hb=475ee53aaaa011ba14a34af34d3340257d6f9d59;hp=d235ef183f7880f2a7ca3d0ea1e55cbab8ce423c;hpb=77e4f177dfee85705c36298c3230b2e4a3e73467;p=plcapi.git diff --git a/PLC/Methods/GetSlices.py b/PLC/Methods/GetSlices.py index d235ef1..c06fbe2 100644 --- a/PLC/Methods/GetSlices.py +++ b/PLC/Methods/GetSlices.py @@ -1,9 +1,9 @@ -# $Id$ from PLC.Method import Method from PLC.Parameter import Parameter, Mixed from PLC.Filter import Filter from PLC.Auth import Auth from PLC.Persons import Person, Persons +from PLC.Nodes import Nodes from PLC.Sites import Site, Sites from PLC.Slices import Slice, Slices @@ -36,16 +36,22 @@ 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 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'] + # pis can view all slices at their site 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'] + # techs can view all slices on the nodes at their site + if 'tech' in self.caller['roles'] and self.caller['site_ids']: + nodes = Nodes(self.api, {'site_id': self.caller['site_ids']}, ['site_id', 'slice_ids']) + for node in nodes: + valid_slice_ids.extend(node['slice_ids']) if not valid_slice_ids: return [] @@ -70,7 +76,7 @@ class GetSlices(Method): # Remove slice_id if not specified if added_fields: for slice in slices: - if 'slice_id' in slice: - del slice['slice_id'] + if 'slice_id' in slice: + del slice['slice_id'] return slices