X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FDeleteSliceFromNodes.py;h=2c15d58342a3169c23fd9fff4125c8cdb16fe552;hb=9ad1311ca10e1d8010a6494a2cde43ffcd3aa8e7;hp=b7e96633a547b1ab6c3199f91195a86944487ed0;hpb=286cdfc25f6ef8fd3e0ed59a175bcf801b14038a;p=plcapi.git

diff --git a/PLC/Methods/DeleteSliceFromNodes.py b/PLC/Methods/DeleteSliceFromNodes.py
index b7e9663..2c15d58 100644
--- a/PLC/Methods/DeleteSliceFromNodes.py
+++ b/PLC/Methods/DeleteSliceFromNodes.py
@@ -1,15 +1,15 @@
-# $Id#
 from PLC.Faults import *
 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 Auth
+from PLC.Plugins import PluginManager
 
 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.
     """
@@ -20,7 +20,7 @@ class DeleteSliceFromNodes(Method):
         Auth(),
        Mixed(Slice.fields['slice_id'],
               Slice.fields['name']),
-	[Mixed(Node.fields['node_id'],
+        [Mixed(Node.fields['node_id'],
                Node.fields['hostname'])]
         ]
 
@@ -33,6 +33,9 @@ class DeleteSliceFromNodes(Method):
             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
@@ -40,20 +43,22 @@ class DeleteSliceFromNodes(Method):
                 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
+        # 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"
+        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()
-	
-	self.event_objects = {'Node': [node['node_id'] for node in nodes],
-			      'Slice': [slice['slice_id']]}	 
+
+        self.event_objects = {'Node': [node['node_id'] for node in nodes],
+                              'Slice': [slice['slice_id']]}
+
+        PluginManager(self.api, auth).notify("slice.DeleteFromNodes", self.event_objects)
 
         return 1