+# $Id$
+# $URL$
from PLC.Faults import *
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.Nodes import Node, Nodes
from PLC.Slices import Slice, Slices
+from PLC.Persons import Person, Persons
from PLC.Auth import Auth
class AddSliceToNodes(Method):
# Get slice information
slices = Slices(self.api, [slice_id_or_name])
if not slices:
- raise PLCInvalidArgument, "No such slice"
+ raise PLCInvalidArgument, "No such slice %r"%slice_id_or_name
slice = slices[0]
if slice['peer_id'] is not None:
raise PLCPermissionDenied, "Specified slice not associated with any of your sites"
# Get specified nodes, add them to the slice
- nodes = Nodes(self.api, node_id_or_hostname_list)
+ nodes = Nodes(self.api, node_id_or_hostname_list, ['node_id', 'hostname', 'slice_ids', 'slice_ids_whitelist', 'site_id'])
+
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']:
- raise PLCInvalidArgument, "%s is not on %s's whitelist" % \
+ 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'])
if slice['slice_id'] not in node['slice_ids']:
slice.add_node(node, commit = False)
slice.sync()
- self.event_objects = {'Node': [node['node_id'] for node in nodes],
+ nodeids = [node['node_id'] for node in nodes]
+ self.event_objects = {'Node': nodeids,
'Slice': [slice['slice_id']]}
+ self.message = 'Slice %d added to nodes %s' % (slice['slice_id'], nodeids)
return 1