X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FDeletePersonFromSlice.py;h=5a46426c5b516a87034ac8f1d452c774653dbcdd;hb=238d5594712b9d918636501e754a8f5816313e25;hp=bca374c578bd839c4e6cd843a8298d365fef929a;hpb=d4c363a3ee55334eacd91f303adf6ecc20055d1e;p=plcapi.git

diff --git a/PLC/Methods/DeletePersonFromSlice.py b/PLC/Methods/DeletePersonFromSlice.py
index bca374c..5a46426 100644
--- a/PLC/Methods/DeletePersonFromSlice.py
+++ b/PLC/Methods/DeletePersonFromSlice.py
@@ -31,16 +31,20 @@ class DeletePersonFromSlice(Method):
         persons = Persons(self.api, [person_id_or_email])
         if not persons:
             raise PLCInvalidArgument, "No such account"
-
         person = persons[0]
 
         # Get slice information
         slices = Slices(self.api, [slice_id_or_name])
         if not slices:
             raise PLCInvalidArgument, "No such slice"
-
         slice = slices[0]
 
+        # N.B. Allow foreign users to be added to local slices and
+        # local users to be added to foreign slices (and, of course,
+        # local users to be added to local slices).
+        if person['peer_id'] is not None and slice['peer_id'] is not None:
+            raise PLCInvalidArgument, "Cannot delete foreign users from foreign slices"
+
         # If we are not admin, make sure the caller is a pi
         # of the site associated with the slice
 	if 'admin' not in self.caller['roles']: