X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FAddSliceToNodes.py;h=d5a2c8c2ad8b948756fd10ace30f7d72bd667010;hb=801d1c69ef9f19c5f2e439e261407d4d28892884;hp=8cc9ad772f31e65c4bcf1f62cea3346eba3f37a7;hpb=1f8c38dd1357c93e4be8d94456b7274a591d2db4;p=plcapi.git

diff --git a/PLC/Methods/AddSliceToNodes.py b/PLC/Methods/AddSliceToNodes.py
index 8cc9ad7..d5a2c8c 100644
--- a/PLC/Methods/AddSliceToNodes.py
+++ b/PLC/Methods/AddSliceToNodes.py
@@ -3,12 +3,16 @@ 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):
     """
-    Adds the specified slice to the specified nodes. If the slice is
-    already associated with a node, no errors are returned. 
+    Adds the specified slice to the specified nodes. Nodes may be
+    either local or foreign nodes.
+
+    If the slice is already associated with a node, no errors are
+    returned.
 
     Returns 1 if successful, faults otherwise.
     """
@@ -25,20 +29,15 @@ class AddSliceToNodes(Method):
 
     returns = Parameter(int, '1 if successful')
 
-    event_type = 'AddTo'
-    object_type = 'Node'
-    object_ids = []
-
     def call(self, auth, slice_id_or_name, node_id_or_hostname_list):
         # Get slice information
         slices = Slices(self.api, [slice_id_or_name])
         if not slices:
             raise PLCInvalidArgument, "No such slice"
+        slice = slices[0]
 
-        slice = slices.values()[0]
-
-	 # Get specified nodes
-        nodes = Nodes(self.api, node_id_or_hostname_list).values()
+        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']:
@@ -48,11 +47,23 @@ class AddSliceToNodes(Method):
             elif slice['site_id'] not in self.caller['site_ids']:
                 raise PLCPermissionDenied, "Specified slice not associated with any of your sites"
 	
-	# Add slice to all nodes found
+        # Get specified nodes, add them to the slice         
+        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'] 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)
-		 
-	self.object_ids = [node['node_id'] for node in nodes]
+                slice.add_node(node, commit = False)
+
+        slice.sync()
+
+	self.event_objects = {'Node': [node['node_id'] for node in nodes],
+			      'Slice': [slice['slice_id']]}
 
         return 1