X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FAddSliceToNodes.py;h=04e5d3b486f404a7778fa6084d2f021a22d9c652;hb=9538a99a4190a75414c5d3ad37b8ed928bb03e21;hp=dffb59cd6fd31530002c8a5c7a5e2b68b95d6026;hpb=024a2d9c7540cc162dff347b5f74353a292971e4;p=plcapi.git

diff --git a/PLC/Methods/AddSliceToNodes.py b/PLC/Methods/AddSliceToNodes.py
index dffb59c..04e5d3b 100644
--- a/PLC/Methods/AddSliceToNodes.py
+++ b/PLC/Methods/AddSliceToNodes.py
@@ -2,18 +2,16 @@ from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Nodes import Node, Nodes
-from PLC.ForeignNodes import ForeignNode, ForeignNodes
 from PLC.Slices import Slice, Slices
 from PLC.Auth import Auth
 
 class AddSliceToNodes(Method):
     """
-    Adds the specified slice to the specified nodes.
-    Nodes can be either regular (local) nodes as returned by GetNodes
-    or foreign nodes as returned by GetForeignNodes
+    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. 
+    If the slice is already associated with a node, no errors are
+    returned.
 
     Returns 1 if successful, faults otherwise.
     """
@@ -30,38 +28,33 @@ class AddSliceToNodes(Method):
 
     returns = Parameter(int, '1 if successful')
 
-    event_type = 'AddTo'
-    object_type = 'Node'
 
     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]
 
+        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
-            # Thierry : I cannot figure out how this works
-            # how is having pi role related to being in a slice ?
             elif 'pi' not in self.caller['roles']:
                 raise PLCPermissionDenied, "Not a member of the specified slice"
             elif slice['site_id'] not in self.caller['site_ids']:
                 raise PLCPermissionDenied, "Specified slice not associated with any of your sites"
 	
-        # Get specified nodes, add them to the slice
-         
+        # Get specified nodes, add them to the slice         
         nodes = Nodes(self.api, node_id_or_hostname_list)
-        foreign_nodes = ForeignNodes (self.api, node_id_or_hostname_list)
-        all_nodes = nodes+foreign_nodes;
-	for node in all_nodes:
+	for node in nodes:
             if slice['slice_id'] not in node['slice_ids']:
                 slice.add_node(node, commit = False)
 
         slice.sync()
 
-	self.object_ids = [node['node_id'] for node in all_nodes]
+	self.object_ids = [node['node_id'] for node in nodes]
 
         return 1