no longer return delegated and nm-controller slices if node has a whitelist
authorTony Mack <tmack@cs.princeton.edu>
Fri, 9 Jan 2009 22:06:46 +0000 (22:06 +0000)
committerTony Mack <tmack@cs.princeton.edu>
Fri, 9 Jan 2009 22:06:46 +0000 (22:06 +0000)
PLC/Methods/GetSlivers.py

index e23e5fc..df9ecc4 100644 (file)
@@ -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)