Add notification plugin support to AddSliceToNodes and DeleteSliceFromNodes

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

diff --git a/PLC/Methods/DeleteSliceFromNodes.py b/PLC/Methods/DeleteSliceFromNodes.py
index b2705d5..2c15d58 100644 (file)
--- a/PLC/Methods/DeleteSliceFromNodes.py
+++ b/PLC/Methods/DeleteSliceFromNodes.py
@@ -4,11 +4,12 @@ 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.
     """
@@ -17,9 +18,9 @@ class DeleteSliceFromNodes(Method):
 
     accepts = [
         Auth(),
-        Mixed(Slice.fields['slice_id'],
+       Mixed(Slice.fields['slice_id'],
               Slice.fields['name']),
-       [Mixed(Node.fields['node_id'],
+        [Mixed(Node.fields['node_id'],
                Node.fields['hostname'])]
         ]
 
@@ -42,18 +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:
+        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