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
Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch
[plcapi.git]
/
PLC
/
Methods
/
DeleteSlice.py
diff --git
a/PLC/Methods/DeleteSlice.py
b/PLC/Methods/DeleteSlice.py
index
ff89544
..
297f8a9
100644
(file)
--- a/
PLC/Methods/DeleteSlice.py
+++ b/
PLC/Methods/DeleteSlice.py
@@
-2,7
+2,7
@@
from PLC.Faults import *
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.Slices import Slice, Slices
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.Slices import Slice, Slices
-from PLC.Auth import
Password
Auth
+from PLC.Auth import Auth
class DeleteSlice(Method):
"""
class DeleteSlice(Method):
"""
@@
-18,7
+18,7
@@
class DeleteSlice(Method):
roles = ['admin', 'pi', 'user']
accepts = [
roles = ['admin', 'pi', 'user']
accepts = [
-
Password
Auth(),
+ Auth(),
Mixed(Slice.fields['slice_id'],
Slice.fields['name']),
]
Mixed(Slice.fields['slice_id'],
Slice.fields['name']),
]
@@
-26,11
+26,14
@@
class DeleteSlice(Method):
returns = Parameter(int, '1 if successful')
def call(self, auth, slice_id_or_name):
returns = Parameter(int, '1 if successful')
def call(self, auth, slice_id_or_name):
- slices = Slices(self.api, [slice_id_or_name])
.values()
+ slices = Slices(self.api, [slice_id_or_name])
if not slices:
raise PLCInvalidArgument, "No such slice"
slice = slices[0]
if not slices:
raise PLCInvalidArgument, "No such slice"
slice = slices[0]
+ if slice['peer_id'] is not None:
+ raise PLCInvalidArgument, "Not a local slice"
+
if 'admin' not in self.caller['roles']:
if self.caller['person_id'] in slice['person_ids']:
pass
if 'admin' not in self.caller['roles']:
if self.caller['person_id'] in slice['person_ids']:
pass
@@
-40,5
+43,6
@@
class DeleteSlice(Method):
raise PLCPermissionDenied, "Specified slice not associated with any of your sites"
slice.delete()
raise PLCPermissionDenied, "Specified slice not associated with any of your sites"
slice.delete()
+ self.event_objects = {'Slice': [slice['slice_id']]}
return 1
return 1