Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

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

diff --git a/PLC/Methods/DeleteSliceFromNodes.py b/PLC/Methods/DeleteSliceFromNodes.py
index 524a648..2390be5 100644 (file)
--- a/PLC/Methods/DeleteSliceFromNodes.py
+++ b/PLC/Methods/DeleteSliceFromNodes.py
@@ -17,7 +17,7 @@ class DeleteSliceFromNodes(Method):
 
     accepts = [
         Auth(),
-        Mixed(Slice.fields['slice_id'],
+       Mixed(Slice.fields['slice_id'],
               Slice.fields['name']),
        [Mixed(Node.fields['node_id'],
                Node.fields['hostname'])]
@@ -30,11 +30,7 @@ class DeleteSliceFromNodes(Method):
         slices = Slices(self.api, [slice_id_or_name])
         if not slices:
             raise PLCInvalidArgument, "No such slice"
-
-        slice = slices.values()[0]
-
-       # Get specified nodes
-        nodes = Nodes(self.api, node_id_or_hostname_list).values()
+        slice = slices[0]
 
         if 'admin' not in self.caller['roles']:
             if self.caller['person_id'] in slice['person_ids']:
@@ -45,8 +41,18 @@ class DeleteSliceFromNodes(Method):
                 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)
+                slice.remove_node(node, commit = False)
+
+        slice.sync()
+       
+       self.event_objects = {'Node': [node['node_id'] for node in nodes],
+                             'Slice': [slice['slice_id']]}      
 
         return 1