- Change .py files to use 4-space indents and no hard tab characters.

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

diff --git a/PLC/Methods/AddPersonToSlice.py b/PLC/Methods/AddPersonToSlice.py
index bd16e04..1cee030 100644 (file)
--- a/PLC/Methods/AddPersonToSlice.py
+++ b/PLC/Methods/AddPersonToSlice.py
@@ -1,3 +1,5 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
@@ -8,7 +10,7 @@ from PLC.Auth import Auth
 class AddPersonToSlice(Method):
     """
     Adds the specified person to the specified slice. If the person is
-    already a member of the slice, no errors are returned. 
+    already a member of the slice, no errors are returned.
 
     Returns 1 if successful, faults otherwise.
     """
@@ -30,24 +32,32 @@ class AddPersonToSlice(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 add foreign users to 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 'admin' not in self.caller['roles']:
             if slice['site_id'] not in self.caller['site_ids']:
                 raise PLCPermissionDenied, "Not allowed to add users to this slice"
 
-       if slice['slice_id'] not in person['slice_ids']:
+        if slice['slice_id'] not in person['slice_ids']:
             slice.add_person(person)
-       self.object_ids = [slice['slice_id']]
+
+        # Logging variables
+        self.event_objects = {'Person': [person['person_id']],
+                              'Slice': [slice['slice_id']]}
+        self.object_ids = [slice['slice_id']]
 
         return 1