From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 21 Apr 2011 00:30:21 +0000 (-0400)
Subject: add node tags as root not as caller
X-Git-Tag: plcapi-5.0-33~5^2~3^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fa30ab2d1e1b9e35b1852bfb775620fb8e517496;p=plcapi.git

add node tags as root not as caller
---

diff --git a/PLC/Methods/AddNode.py b/PLC/Methods/AddNode.py
index a1e8337a..fade8275 100644
--- a/PLC/Methods/AddNode.py
+++ b/PLC/Methods/AddNode.py
@@ -10,7 +10,7 @@ from PLC.Peers import Peers
 from PLC.Sites import Site, Sites
 from PLC.Nodes import Node, Nodes
 from PLC.TagTypes import TagTypes
-from PLC.NodeTags import NodeTags
+from PLC.NodeTags import NodeTags, NodeTag
 from PLC.Methods.AddNodeTag import AddNodeTag
 from PLC.Methods.UpdateNodeTag import UpdateNodeTag
 
@@ -80,13 +80,22 @@ class AddNode(Method):
 
         for (tagname,value) in tags.iteritems():
             # the tagtype instance is assumed to exist, just check that
-            if not TagTypes(self.api,{'tagname':tagname}):
+            tag_types = TagTypes(self.api,{'tagname':tagname})
+            if not tag_types:
                 raise PLCInvalidArgument,"No such TagType %s"%tagname
+            tag_type = tag_types[0] 
             node_tags=NodeTags(self.api,{'tagname':tagname,'node_id':node['node_id']})
             if not node_tags:
-                AddNodeTag(self.api).__call__(auth,node['node_id'],tagname,value)
+                node_tag = NodeTag(self.api)
+                node_tag['node_id'] = node['node_id']
+                node_tag['tag_type_id'] = tag_type['tag_type_id']
+                node_tag['tagname']  = tagname
+                node_tag['value'] = value
+                node_tag.sync()
             else:
-                UpdateNodeTag(self.api).__call__(auth,node_tags[0]['node_tag_id'],value)
+                node_tag = node_tags[0]
+                node_tag['value'] = value
+                node_tag.sync() 
 
         self.event_objects = {'Site': [site['site_id']],
                               'Node': [node['node_id']]}