- import Faults

[plcapi.git] / PLC / Methods / AddSliceToNodes.py

diff --git a/PLC/Methods/AddSliceToNodes.py b/PLC/Methods/AddSliceToNodes.py
index 37ad4a3..f2b042f 100644 (file)
--- a/PLC/Methods/AddSliceToNodes.py
+++ b/PLC/Methods/AddSliceToNodes.py
@@ -2,15 +2,13 @@ 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
+    Nodes can be either local or foreign nodes, as returned by GetNodes
 
     If the slice is
     already associated with a node, no errors are returned. 
@@ -30,9 +28,6 @@ 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
@@ -40,7 +35,8 @@ class AddSliceToNodes(Method):
         if not slices:
             raise PLCInvalidArgument, "No such slice"
 
-        slice = slices.values()[0]
+        slice = slices[0]
+       PLCCheckLocalSlice(slice,"AddSliceToNodes")
 
         if 'admin' not in self.caller['roles']:
             if self.caller['person_id'] in slice['person_ids']:
@@ -52,18 +48,13 @@ class AddSliceToNodes(Method):
             elif slice['site_id'] not in self.caller['site_ids']:
                 raise PLCPermissionDenied, "Specified slice not associated with any of your sites"
        
-        # Get specified nodes, and them to the slice
-        nodes = Nodes(self.api, node_id_or_hostname_list).values()
+        # Get specified nodes, add them to the slice
+         
+        nodes = Nodes(self.api, node_id_or_hostname_list)
        for node in nodes:
             if slice['slice_id'] not in node['slice_ids']:
                 slice.add_node(node, commit = False)
 
-        # the same for foreign_nodes
-        foreign_nodes = ForeignNodes (self.api, node_id_or_hostname_list).values()
-        for foreign_node in foreign_nodes:
-            if slice['slice_id'] not in foreign_node['slice_ids']:
-                slice.add_node (foreign_node, is_foreign_node=True, commit=False)
-
         slice.sync()
 
        self.object_ids = [node['node_id'] for node in nodes]