blind 2to3

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

diff --git a/PLC/Methods/DeleteSliceTag.py b/PLC/Methods/DeleteSliceTag.py
index 7a574a3..2e133a8 100644 (file)
--- a/PLC/Methods/DeleteSliceTag.py
+++ b/PLC/Methods/DeleteSliceTag.py
@@ -1,13 +1,19 @@
-# $Id$
-# $URL$
+#
+# Thierry Parmentelat - INRIA
+#
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
-from PLC.SliceTags import SliceTag, SliceTags
-from PLC.Slices import Slice, Slices
-from PLC.Nodes import Node, Nodes
 from PLC.Auth import Auth
 
+from PLC.TagTypes import TagTypes, TagType
+from PLC.Nodes import Node, Nodes
+from PLC.Slices import Slice, Slices
+from PLC.SliceTags import SliceTag, SliceTags
+
+# need to import so the core classes get decorated with caller_may_write_tag
+from PLC.AuthorizeHelpers import AuthorizeHelpers
+
 class DeleteSliceTag(Method):
     """
     Deletes the specified slice or sliver attribute.
@@ -21,7 +27,7 @@ class DeleteSliceTag(Method):
     Returns 1 if successful, faults otherwise.
     """
 
-    roles = ['admin', 'pi', 'user']
+    roles = ['admin', 'pi', 'user', 'tech', 'node']
 
     accepts = [
         Auth(),
@@ -33,29 +39,25 @@ class DeleteSliceTag(Method):
     def call(self, auth, slice_tag_id):
         slice_tags = SliceTags(self.api, [slice_tag_id])
         if not slice_tags:
-            raise PLCInvalidArgument, "No such slice attribute"
+            raise PLCInvalidArgument("No such slice attribute")
         slice_tag = slice_tags[0]
 
+        tag_type_id = slice_tag['tag_type_id']
+        tag_type = TagTypes (self.api,[tag_type_id])[0]
+
         slices = Slices(self.api, [slice_tag['slice_id']])
         if not slices:
-            raise PLCInvalidArgument, "No such slice"
+            raise PLCInvalidArgument("No such slice %d"%slice_tag['slice_id'])
         slice = slices[0]
 
         assert slice_tag['slice_tag_id'] in slice['slice_tag_ids']
 
-        if 'admin' not in self.caller['roles']:
-            if self.caller['person_id'] in slice['person_ids']:
-                pass
-            elif 'pi' not in self.caller['roles']:
-                raise PLCPermissionDenied, "Not a member of the specified slice"
-            elif slice['site_id'] not in self.caller['site_ids']:
-                raise PLCPermissionDenied, "Specified slice not associated with any of your sites"
-
-            if slice_tag['min_role_id'] is not None and \
-               min(self.caller['role_ids']) > slice_tag['min_role_id']:
-                raise PLCPermissioinDenied, "Not allowed to delete the specified attribute"
+        # check authorizations
+        node_id_or_hostname=slice_tag['node_id']
+        nodegroup_id_or_name=slice_tag['nodegroup_id']
+        slice.caller_may_write_tag(self.api,self.caller,tag_type,node_id_or_hostname,nodegroup_id_or_name)
 
         slice_tag.delete()
-       self.event_objects = {'SliceTag': [slice_tag['slice_tag_id']]}
+        self.event_objects = {'SliceTag': [slice_tag['slice_tag_id']]}
 
         return 1