- changed gpg_verify() calling convention

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

diff --git a/PLC/Methods/AddSliceToNodes.py b/PLC/Methods/AddSliceToNodes.py
index 7e0a5d9..c57cfb2 100644 (file)
--- a/PLC/Methods/AddSliceToNodes.py
+++ b/PLC/Methods/AddSliceToNodes.py
@@ -3,12 +3,15 @@ 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.Auth import PasswordAuth
+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.
     """
@@ -16,7 +19,7 @@ class AddSliceToNodes(Method):
     roles = ['admin', 'pi', 'user']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Slice.fields['slice_id'],
               Slice.fields['name']),
        [Mixed(Node.fields['node_id'],
@@ -25,16 +28,18 @@ class AddSliceToNodes(Method):
 
     returns = Parameter(int, '1 if successful')
 
+    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]
 
-        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']:
@@ -44,9 +49,14 @@ 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)
        for node in nodes:
             if slice['slice_id'] not in node['slice_ids']:
-                slice.add_node(node)
+                slice.add_node(node, commit = False)
+
+        slice.sync()
+
+       self.object_ids = [node['node_id'] for node in nodes]
 
         return 1