Merge from HEAD. Signed off by tmack.

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

diff --git a/PLC/Methods/DeletePersonFromSlice.py b/PLC/Methods/DeletePersonFromSlice.py
index b9a5977..c990ccd 100644 (file)
--- a/PLC/Methods/DeletePersonFromSlice.py
+++ b/PLC/Methods/DeletePersonFromSlice.py
@@ -3,7 +3,7 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Persons import Person, Persons
 from PLC.Slices import Slice, Slices
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 class DeletePersonFromSlice(Method):
     """
@@ -16,7 +16,7 @@ class DeletePersonFromSlice(Method):
     roles = ['admin', 'pi']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Person.fields['person_id'],
               Person.fields['email']),
         Mixed(Slice.fields['slice_id'],
@@ -30,15 +30,19 @@ class DeletePersonFromSlice(Method):
         persons = Persons(self.api, [person_id_or_email])
         if not persons:
             raise PLCInvalidArgument, "No such account"
-
-        person = persons.values()[0]
+        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]
 
-        slice = slices.values()[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
@@ -48,5 +52,8 @@ class DeletePersonFromSlice(Method):
 
        if slice['slice_id'] in person['slice_ids']:
             slice.remove_person(person)
+       
+       self.event_objects = {'Slice': [slice['slice_id']],
+                             'Person': [person['person_id']]}  
 
         return 1