svn keywords

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

diff --git a/PLC/Methods/DeleteSliceFromNodes.py b/PLC/Methods/DeleteSliceFromNodes.py
index ce46929..22117e0 100644 (file)
--- a/PLC/Methods/DeleteSliceFromNodes.py
+++ b/PLC/Methods/DeleteSliceFromNodes.py
@@ -1,3 +1,5 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
@@ -17,7 +19,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'])]
@@ -25,15 +27,11 @@ class DeleteSliceFromNodes(Method):
 
     returns = Parameter(int, '1 if successful')
 
-    event_type = 'DeleteFrom'
-    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]
 
         if 'admin' not in self.caller['roles']:
@@ -49,11 +47,14 @@ class DeleteSliceFromNodes(Method):
        # 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()
        
-       self.object_ids = [node['node_id'] for node in nodes]
+       self.event_objects = {'Node': [node['node_id'] for node in nodes],
+                             'Slice': [slice['slice_id']]}      
 
         return 1