reverting Scott's change - he is to use aspects instead

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

diff --git a/PLC/Methods/DeleteSliceFromNodes.py b/PLC/Methods/DeleteSliceFromNodes.py
index c61c5eb..1a82ad1 100644 (file)
--- a/PLC/Methods/DeleteSliceFromNodes.py
+++ b/PLC/Methods/DeleteSliceFromNodes.py
@@ -3,49 +3,59 @@ 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 DeleteSliceFromNodes(Method):
     """
     Deletes the specified slice from the specified nodes. If the slice is
-    not associated with a node, no errors are returned. 
+    not associated with a node, no errors are returned.
 
     Returns 1 if successful, faults otherwise.
     """
 
-    roles = ['admin', 'pi']
+    roles = ['admin', 'pi', 'user']
 
     accepts = [
-        PasswordAuth(),
-        Mixed(Slice.fields['slice_id'],
+        Auth(),
+       Mixed(Slice.fields['slice_id'],
               Slice.fields['name']),
-       [Mixed(Node.fields['node_id'],
+        [Mixed(Node.fields['node_id'],
                Node.fields['hostname'])]
         ]
 
     returns = Parameter(int, '1 if successful')
 
     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
+            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"
+
+        # Remove slice from all nodes found
+
+        # Get specified nodes
+        nodes = Nodes(self.api, node_id_or_hostname_list)
+        for node in nodes:
+            if slice['peer_id'] is not None and node['peer_id'] is not None:
+                raise PLCPermissionDenied, "Not allowed to remove peer slice from peer node"
+            if slice['slice_id'] in node['slice_ids']:
+                slice.remove_node(node, commit = False)
+
+        slice.sync()
 
-        slice = slices.values()[0]
-
-       # Get specified nodes
-        nodes = Nodes(self.api, node_id_or_hostname_list).values()
-
-        # If we are not admin, make sure the caller is a pi
-        # of the site associated with the slice
-       if 'admin' not in self.caller['roles']:
-               if slice['site_id'] not in self.caller['site_ids']:
-                       raise PLCPermissionDenied, "Not allowed to delete nodes from this slice"
-       
-       # add slice to all nodes found
-       for node in nodes:
-               if slice['slice_id'] in node['slice_ids']:
-                       slice.remove_node(node)
+        self.event_objects = {'Node': [node['node_id'] for node in nodes],
+                              'Slice': [slice['slice_id']]}
 
         return 1