- only check expires if slice isn't being deleted

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

diff --git a/PLC/Methods/DeleteSliceFromNodes.py b/PLC/Methods/DeleteSliceFromNodes.py
index d3e31f0..87e2e07 100644 (file)
--- a/PLC/Methods/DeleteSliceFromNodes.py
+++ b/PLC/Methods/DeleteSliceFromNodes.py
@@ -2,7 +2,6 @@ from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Nodes import Node, Nodes
-from PLC.ForeignNodes import ForeignNode, ForeignNodes
 from PLC.Slices import Slice, Slices
 from PLC.Auth import Auth
 
@@ -26,17 +25,19 @@ 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 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
@@ -49,14 +50,12 @@ class DeleteSliceFromNodes(Method):
 
        # Get specified nodes
         nodes = Nodes(self.api, node_id_or_hostname_list)
-        foreign_nodes = ForeignNodes(self.api, node_id_or_hostname_list)
-        all_nodes = nodes+foreign_nodes;
-       for node in all_nodes:
+       for node in nodes:
             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 all_nodes]
+       self.object_ids = [node['node_id'] for node in nodes]
 
         return 1