From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 16 May 2014 07:54:01 +0000 (+0200)
Subject: exceptions thrown by AddPersonToSlice and DeletePersonFromSlice show more context
X-Git-Tag: plcapi-5.3-3~1
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=8a488f82ba7892d6a6eb1265f0f327ec75b71149

exceptions thrown by AddPersonToSlice and DeletePersonFromSlice show more context
---

diff --git a/PLC/Methods/AddPersonToSlice.py b/PLC/Methods/AddPersonToSlice.py
index d4a17a4..41e6a6a 100644
--- a/PLC/Methods/AddPersonToSlice.py
+++ b/PLC/Methods/AddPersonToSlice.py
@@ -29,13 +29,13 @@ class AddPersonToSlice(Method):
         # 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
@@ -48,7 +48,7 @@ class AddPersonToSlice(Method):
         # 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 add users to this slice"
+                raise PLCPermissionDenied, "Not allowed to add users to slice %s"%slice_id_or_name
 
         if slice['slice_id'] not in person['slice_ids']:
             slice.add_person(person)
diff --git a/PLC/Methods/DeletePersonFromSlice.py b/PLC/Methods/DeletePersonFromSlice.py
index 8cdd316..dbec684 100644
--- a/PLC/Methods/DeletePersonFromSlice.py
+++ b/PLC/Methods/DeletePersonFromSlice.py
@@ -29,13 +29,13 @@ class DeletePersonFromSlice(Method):
         # 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
@@ -48,7 +48,7 @@ class DeletePersonFromSlice(Method):
         # 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"
+                raise PLCPermissionDenied, "Not allowed to delete users from slice %s"%slice_id_or_name
 
         if slice['slice_id'] in person['slice_ids']:
             slice.remove_person(person)