From 8a5f31159de364e39f51ea74143b1898da3112e7 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 9 Jan 2009 22:06:46 +0000 Subject: [PATCH] no longer return delegated and nm-controller slices if node has a whitelist --- PLC/Methods/GetSlivers.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PLC/Methods/GetSlivers.py b/PLC/Methods/GetSlivers.py index e23e5fc..df9ecc4 100644 --- a/PLC/Methods/GetSlivers.py +++ b/PLC/Methods/GetSlivers.py @@ -207,8 +207,11 @@ class GetSlivers(Method): system_slice_ids = system_slice_attributes.keys() # Get nm-controller slices - controller_and_delegated_slices = Slices(self.api, {'instantiation': ['nm-controller', 'delegated']}, ['slice_id']).dict('slice_id') - controller_and_delegated_slice_ids = controller_and_delegated_slices.keys() + controller_and_delegated_slices = [] + if not node['slice_ids_whitelist']: + controller_and_delegated_slices = Slices(self.api, {'instantiation': ['nm-controller', 'delegated']}, ['slice_id']).dict('slice_id') + controller_and_delegated_slice_ids = controller_and_delegated_slices.keys() + slice_ids = system_slice_ids + controller_and_delegated_slice_ids + node['slice_ids'] slivers = get_slivers(self.api, slice_ids, node) -- 2.43.0