fix adding nodes, and the sync target in the process

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

diff --git a/PLC/Methods/AddNodeTag.py b/PLC/Methods/AddNodeTag.py
index 04dae7f..81e46c0 100644 (file)
--- a/PLC/Methods/AddNodeTag.py
+++ b/PLC/Methods/AddNodeTag.py
@@ -1,3 +1,5 @@
+# $Id$
+# $URL$
 #
 # Thierry Parmentelat - INRIA
 #
@@ -8,12 +10,11 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Auth import Auth
 
-from PLC.NodeTagTypes import NodeTagType, NodeTagTypes
-from PLC.NodeTags import NodeTag, NodeTags
+from PLC.Sites import Sites
 from PLC.Nodes import Node, Nodes
+from PLC.TagTypes import TagType, TagTypes
+from PLC.NodeTags import NodeTag, NodeTags
 
-from PLC.Nodes import Nodes
-from PLC.Sites import Sites
 
 class AddNodeTag(Method):
     """
@@ -34,9 +35,9 @@ class AddNodeTag(Method):
         # no other way to refer to a node
         Mixed(Node.fields['node_id'],
               Node.fields['hostname']),
-        Mixed(NodeTagType.fields['node_tag_type_id'],
-              NodeTagType.fields['tagname']),
-        NodeTag.fields['tagvalue'],
+        Mixed(TagType.fields['tag_type_id'],
+              TagType.fields['tagname']),
+        NodeTag.fields['value'],
         ]
 
     returns = Parameter(int, 'New node_tag_id (> 0) if successful')
@@ -44,25 +45,25 @@ class AddNodeTag(Method):
     object_type = 'Node'
 
 
-    def call(self, auth, node_id, node_tag_type_id_or_name, value):
+    def call(self, auth, node_id, tag_type_id_or_name, value):
         nodes = Nodes(self.api, [node_id])
         if not nodes:
             raise PLCInvalidArgument, "No such node %r"%node_id
         node = nodes[0]
 
-        node_tag_types = NodeTagTypes(self.api, [node_tag_type_id_or_name])
-        if not node_tag_types:
-            raise PLCInvalidArgument, "No such node tag type %r"%node_tag_type_id_or_name
-        node_tag_type = node_tag_types[0]
+        tag_types = TagTypes(self.api, [tag_type_id_or_name])
+        if not tag_types:
+            raise PLCInvalidArgument, "No such node tag type %r"%tag_type_id_or_name
+        tag_type = tag_types[0]
 
        # checks for existence - does not allow several different tags
         conflicts = NodeTags(self.api,
                                         {'node_id':node['node_id'],
-                                         'node_tag_type_id':node_tag_type['node_tag_type_id']})
+                                         'tag_type_id':tag_type['tag_type_id']})
 
         if len(conflicts) :
             raise PLCInvalidArgument, "Node %d already has tag %d"%(node['node_id'],
-                                                                               node_tag_type['node_tag_type_id'])
+                                                                               tag_type['tag_type_id'])
 
        # check permission : it not admin, is the user affiliated with the right site
        if 'admin' not in self.caller['roles']:
@@ -74,15 +75,15 @@ class AddNodeTag(Method):
            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 = node_tag_type ['min_role_id']
+           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 node tag, requires role %d",required_min_role
+               raise PLCPermissionDenied, "Not allowed to modify the specified node tag, requires role %d"%required_min_role
 
         node_tag = NodeTag(self.api)
         node_tag['node_id'] = node['node_id']
-        node_tag['node_tag_type_id'] = node_tag_type['node_tag_type_id']
-        node_tag['tagvalue'] = value
+        node_tag['tag_type_id'] = tag_type['tag_type_id']
+        node_tag['value'] = value
 
         node_tag.sync()
        self.object_ids = [node_tag['node_tag_id']]