- Change .py files to use 4-space indents and no hard tab characters.

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

diff --git a/PLC/Methods/AddIlink.py b/PLC/Methods/AddIlink.py
index c2c22c5..6316805 100644 (file)
--- a/PLC/Methods/AddIlink.py
+++ b/PLC/Methods/AddIlink.py
@@ -1,3 +1,5 @@
+# $Id$
+# $URL$
 #
 # Thierry Parmentelat - INRIA
 #
@@ -8,7 +10,7 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Auth import Auth
 
-from PLC.IlinkTypes import IlinkType, IlinkTypes
+from PLC.TagTypes import TagType, TagTypes
 from PLC.Ilinks import Ilink, Ilinks
 from PLC.Interfaces import Interface, Interfaces
 
@@ -17,8 +19,8 @@ from PLC.Sites import Sites
 class AddIlink(Method):
     """
     Create a link between two interfaces
-    The link has a type, that needs be created beforehand
-    and an optional value. 
+    The link has a tag type, that needs be created beforehand
+    and an optional value.
 
     Returns the new ilink_id (> 0) if successful, faults
     otherwise.
@@ -31,55 +33,55 @@ class AddIlink(Method):
         # refer to either the id or the type name
         Ilink.fields['src_interface_id'],
         Ilink.fields['dst_interface_id'],
-        Mixed(IlinkType.fields['ilink_type_id'],
-              IlinkType.fields['name']),
+        Mixed(TagType.fields['tag_type_id'],
+              TagType.fields['tagname']),
         Ilink.fields['value'],
         ]
 
     returns = Parameter(int, 'New ilink_id (> 0) if successful')
 
-    def call(self, auth,  src_if_id, dst_if_id, ilink_type_id_or_name, value):
+    def call(self, auth,  src_if_id, dst_if_id, tag_type_id_or_name, value):
 
-        src_if = Interfaces (self.api, [src_if_id],[interface_id])
+        src_if = Interfaces (self.api, [src_if_id],['interface_id'])
         if not src_if:
             raise PLCInvalidArgument, "No such source interface %r"%src_if_id
-        dst_if = Interfaces (self.api, [dst_if_id],[interface_id])
+        dst_if = Interfaces (self.api, [dst_if_id],['interface_id'])
         if not dst_if:
             raise PLCInvalidArgument, "No such destination interface %r"%dst_if_id
 
-        ilink_types = IlinkTypes(self.api, [ilink_type_id_or_name])
-        if not ilink_types:
-            raise PLCInvalidArgument, "No such ilink type %r"%ilink_type_id_or_name
-        ilink_type = ilink_types[0]
+        tag_types = TagTypes(self.api, [tag_type_id_or_name])
+        if not tag_types:
+            raise PLCInvalidArgument, "AddIlink: No such tag type %r"%tag_type_id_or_name
+        tag_type = tag_types[0]
 
-       # checks for existence - with the same type
+        # checks for existence - with the same type
         conflicts = Ilinks(self.api,
-                           {'ilink_type_id':ilink_type['ilink_type_id'],
+                           {'tag_type_id':tag_type['tag_type_id'],
                             'src_interface_id':src_if_id,
                             'dst_interface_id':dst_if_id,})
 
         if len(conflicts) :
             ilink=conflicts[0]
             raise PLCInvalidArgument, "Ilink (%s,%d,%d) already exists and has value %r"\
-                %(ilink_type['name'],src_if_id,dst_if_id,ilink['value'])
-
-       if 'admin' not in self.caller['roles']:
-#      # check permission : it not admin, is the user affiliated with the right site(s) ????
-#          # locate node
-#          node = Nodes (self.api,[node['node_id']])[0]
-#          # locate site
-#          site = Sites (self.api, [node['site_id']])[0]
-#          # check caller is affiliated with this site
-#          if self.caller['person_id'] not in site['person_ids']:
-#              raise PLCPermissionDenied, "Not a member of the hosting site %s"%site['abbreviated_site']
-           
-           required_min_role = ilink_type ['min_role_id']
-           if required_min_role is not None and \
-                   min(self.caller['role_ids']) > required_min_role:
-               raise PLCPermissionDenied, "Not allowed to modify the specified ilink, requires role %d",required_min_role
+                %(tag_type['name'],src_if_id,dst_if_id,ilink['value'])
+
+        if 'admin' not in self.caller['roles']:
+#       # check permission : it not admin, is the user affiliated with the right site(s) ????
+#           # locate node
+#           node = Nodes (self.api,[node['node_id']])[0]
+#           # locate site
+#           site = Sites (self.api, [node['site_id']])[0]
+#           # check caller is affiliated with this site
+#           if self.caller['person_id'] not in site['person_ids']:
+#               raise PLCPermissionDenied, "Not a member of the hosting site %s"%site['abbreviated_site']
+
+            required_min_role = tag_type ['min_role_id']
+            if required_min_role is not None and \
+                    min(self.caller['role_ids']) > required_min_role:
+                raise PLCPermissionDenied, "Not allowed to modify the specified ilink, requires role %d",required_min_role
 
         ilink = Ilink(self.api)
-        ilink['ilink_type_id'] = ilink_type['ilink_type_id']
+        ilink['tag_type_id'] = tag_type['tag_type_id']
         ilink['src_interface_id'] = src_if_id
         ilink['dst_interface_id'] = dst_if_id
         ilink['value'] = value
@@ -87,6 +89,6 @@ class AddIlink(Method):
         ilink.sync()
 
         self.object_type = 'Interface'
-       self.object_ids = [src_if_id,dst_if_id]
+        self.object_ids = [src_if_id,dst_if_id]
 
         return ilink['ilink_id']