svn keywords

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

diff --git a/PLC/Methods/AddPersonToSlice.py b/PLC/Methods/AddPersonToSlice.py
index 865ff9d..b38e111 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
@@ -24,24 +26,26 @@ class AddPersonToSlice(Method):
         ]
 
     returns = Parameter(int, '1 if successful')
-    event_type = 'AddTo'
-    object_type = 'Slice'
 
     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"
-
         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']:
@@ -50,6 +54,10 @@ class AddPersonToSlice(Method):
 
        if slice['slice_id'] not in person['slice_ids']:
             slice.add_person(person)
+
+        # Logging variables
+       self.event_objects = {'Person': [person['person_id']],
+                             'Slice': [slice['slice_id']]}     
        self.object_ids = [slice['slice_id']]
 
         return 1