Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

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

diff --git a/PLC/Methods/DeleteSliceAttribute.py b/PLC/Methods/DeleteSliceAttribute.py
index ea3ecb2..06a99f3 100644 (file)
--- a/PLC/Methods/DeleteSliceAttribute.py
+++ b/PLC/Methods/DeleteSliceAttribute.py
@@ -28,9 +28,6 @@ class DeleteSliceAttribute(Method):
 
     returns = Parameter(int, '1 if successful')
 
-    object_type = 'Slice'
-
-
     def call(self, auth, slice_attribute_id):
         slice_attributes = SliceAttributes(self.api, [slice_attribute_id])
         if not slice_attributes:
@@ -42,9 +39,6 @@ class DeleteSliceAttribute(Method):
             raise PLCInvalidArgument, "No such slice"
         slice = slices[0]
 
-        if slice['peer_id'] is not None:
-            raise PLCInvalidArgument, "Not a local slice"
-
         assert slice_attribute['slice_attribute_id'] in slice['slice_attribute_ids']
 
         if 'admin' not in self.caller['roles']:
@@ -60,6 +54,6 @@ class DeleteSliceAttribute(Method):
                 raise PLCPermissioinDenied, "Not allowed to delete the specified attribute"
 
         slice_attribute.delete()
-       self.object_ids = [slice_attribute['slice_attribute_id']]
+       self.event_objects = {'SliceAttribute': [slice_attribute['slice_attribute_id']]}
 
         return 1