# Get specified nodes, add them to the slice
nodes = Nodes(self.api, node_id_or_hostname_list)
for node in nodes:
+ # check the slice whitelist on each node first
+ if node['slice_ids_whitelist'] and \
+ slice['slice_id'] not in node['slice_ids_whitelist']:
+ raise PLCInvalidArgument, "%s is not on %s's whitelist" % \
+ (slice['name'], node['hostname'])
if slice['slice_id'] not in node['slice_ids']:
slice.add_node(node, commit = False)
accepts = [
Auth(),
- Mixed(Slice.fields['slice_id'],
+ Mixed(Slice.fields['slice_id'],
Slice.fields['name']),
[Mixed(Node.fields['node_id'],
Node.fields['hostname'])]
raise PLCInvalidArgument, "No such slice"
slice = slices[0]
- if slice['peer_id'] is not None:
- raise PLCInvalidArgument, "Not a local slice"
-
if 'admin' not in self.caller['roles']:
if self.caller['person_id'] in slice['person_ids']:
pass
# Get specified nodes
nodes = Nodes(self.api, node_id_or_hostname_list)
for node in nodes:
+ if slice['peer_id'] is not None and node['peer_id'] is not None:
+ raise PLCPermissionDenied, "Not allowed to remove peer slice from peer node"
if slice['slice_id'] in node['slice_ids']:
slice.remove_node(node, commit = False)