From 7032799dbca69570305a673070074aa0404a203c Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Mon, 11 Mar 2013 10:57:52 -0400 Subject: [PATCH] use check_whitelist() and spawn_instances() --- PLC/Methods/AddSliceToNodes.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/PLC/Methods/AddSliceToNodes.py b/PLC/Methods/AddSliceToNodes.py index db074caf..1db307c5 100644 --- a/PLC/Methods/AddSliceToNodes.py +++ b/PLC/Methods/AddSliceToNodes.py @@ -51,15 +51,13 @@ class AddSliceToNodes(Method): nodes = Nodes(self.api, node_id_or_hostname_list, ['node_id', 'hostname', 'slice_ids', 'slice_ids_whitelist', 'site_id']) + slice.spawn_instances(nodes, self.caller) for node in nodes: # check the slice whitelist on each node first # allow users at site to add node to slice, ignoring whitelist - if node['slice_ids_whitelist'] and \ - slice['slice_id'] not in node['slice_ids_whitelist'] and \ - not set(self.caller['site_ids']).intersection([node['site_id']]): - raise PLCInvalidArgument, "%s is not allowed on %s (not on the whitelist)" % \ - (slice['name'], node['hostname']) + node.check_whitelist(slice, self.caller) if slice['slice_id'] not in node['slice_ids']: + tags = sliver_tags.get(node['node_id']) slice.add_node(node, commit = False) slice.sync() -- 2.47.0