From: Tony Mack Date: Thu, 19 May 2011 00:06:58 +0000 (-0400) Subject: Techs can view slices that are running on nodes at their site X-Git-Tag: plcapi-5.0-33~1^2~4 X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=7fa308967c99e3cf2c40fb632854a44a694c7d83 Techs can view slices that are running on nodes at their site --- diff --git a/PLC/Methods/GetSlices.py b/PLC/Methods/GetSlices.py index 22e5e1e..15ebd5c 100644 --- a/PLC/Methods/GetSlices.py +++ b/PLC/Methods/GetSlices.py @@ -5,6 +5,7 @@ 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 @@ -43,10 +44,16 @@ class GetSlices(Method): '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 []