exceptions thrown by AddPersonToSlice and DeletePersonFromSlice show more context

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

diff --git a/PLC/Methods/DeletePersonFromSlice.py b/PLC/Methods/DeletePersonFromSlice.py
index bca374c..dbec684 100644 (file)
--- a/PLC/Methods/DeletePersonFromSlice.py
+++ b/PLC/Methods/DeletePersonFromSlice.py
@@ -8,7 +8,7 @@ from PLC.Auth import Auth
 class DeletePersonFromSlice(Method):
     """
     Deletes the specified person from the specified slice. If the person is
-    not a member of the slice, no errors are returned. 
+    not a member of the slice, no errors are returned.
 
     Returns 1 if successful, faults otherwise.
     """
@@ -25,31 +25,35 @@ class DeletePersonFromSlice(Method):
 
     returns = Parameter(int, '1 if successful')
 
-
     def call(self, auth, person_id_or_email, slice_id_or_name):
         # Get account information
         persons = Persons(self.api, [person_id_or_email])
         if not persons:
-            raise PLCInvalidArgument, "No such account"
-
+            raise PLCInvalidArgument, "No such account %s"%person_id_or_email
         person = persons[0]
 
         # Get slice information
         slices = Slices(self.api, [slice_id_or_name])
         if not slices:
-            raise PLCInvalidArgument, "No such slice"
-
+            raise PLCInvalidArgument, "No such slice %s"%slice_id_or_name
         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']:
-               if slice['site_id'] not in self.caller['site_ids']:
-                       raise PLCPermissionDenied, "Not allowed to delete users from this slice"
+        if 'admin' not in self.caller['roles']:
+            if slice['site_id'] not in self.caller['site_ids']:
+                raise PLCPermissionDenied, "Not allowed to delete users from slice %s"%slice_id_or_name
 
-       if slice['slice_id'] in person['slice_ids']:
+        if slice['slice_id'] in person['slice_ids']:
             slice.remove_person(person)
-       
-       self.object_ids = [slice['slice_id']]
+
+        self.event_objects = {'Slice': [slice['slice_id']],
+                              'Person': [person['person_id']]}
 
         return 1