git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- send email
[plcapi.git]
/
PLC
/
Methods
/
AddSlice.py
diff --git
a/PLC/Methods/AddSlice.py
b/PLC/Methods/AddSlice.py
index
c166e70
..
9cce2b0
100644
(file)
--- a/
PLC/Methods/AddSlice.py
+++ b/
PLC/Methods/AddSlice.py
@@
-38,9
+38,6
@@
class AddSlice(Method):
returns = Parameter(int, 'New slice_id (> 0) if successful')
returns = Parameter(int, 'New slice_id (> 0) if successful')
- event_type = 'Add'
- object_type = 'Slice'
- object_ids = []
def call(self, auth, slice_fields):
slice_fields = dict(filter(can_update, slice_fields.items()))
def call(self, auth, slice_fields):
slice_fields = dict(filter(can_update, slice_fields.items()))
@@
-57,17
+54,19
@@
class AddSlice(Method):
# Get associated site details
login_base = name.split("_")[0]
# Get associated site details
login_base = name.split("_")[0]
- sites = Sites(self.api, [login_base])
.values()
+ sites = Sites(self.api, [login_base])
if not sites:
if not sites:
- raise PLCInvalidArgument, "Invalid slice prefix
"
+ raise PLCInvalidArgument, "Invalid slice prefix
%s in %s"%(login_base,name)
site = sites[0]
if 'admin' not in self.caller['roles']:
if site['site_id'] not in self.caller['site_ids']:
site = sites[0]
if 'admin' not in self.caller['roles']:
if site['site_id'] not in self.caller['site_ids']:
- raise PLCPermissionDenied, "Slice prefix
must be the same as the login_base of one of your sites"
+ raise PLCPermissionDenied, "Slice prefix
%s must be the same as the login_base of one of your sites"%login_base
if len(site['slice_ids']) >= site['max_slices']:
if len(site['slice_ids']) >= site['max_slices']:
- raise PLCInvalidArgument, "Site has reached its maximum allowable slice count"
+ raise PLCInvalidArgument, "Site %s has reached (%d) its maximum allowable slice count (%d)"%(site['name'],
+ len(site['slice_ids']),
+ site['max_slices'])
slice = Slice(self.api, slice_fields)
slice['creator_person_id'] = self.caller['person_id']
slice = Slice(self.api, slice_fields)
slice['creator_person_id'] = self.caller['person_id']