- - added logging variable 'object_type'

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

diff --git a/PLC/Methods/DeleteSliceFromNodes.py b/PLC/Methods/DeleteSliceFromNodes.py
index 71809b7..87e2e07 100644 (file)
--- a/PLC/Methods/DeleteSliceFromNodes.py
+++ b/PLC/Methods/DeleteSliceFromNodes.py
@@ -25,19 +25,18 @@ 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]
 
-       # Get specified nodes
-        nodes = Nodes(self.api, node_id_or_hostname_list)
+        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']:
@@ -48,9 +47,14 @@ 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['slice_id'] in node['slice_ids']:
-                slice.remove_node(node)
+                slice.remove_node(node, commit = False)
+
+        slice.sync()
        
        self.object_ids = [node['node_id'] for node in nodes]