get rid of svn keywords once and for good

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

diff --git a/PLC/Methods/UpdateNode.py b/PLC/Methods/UpdateNode.py
index dbcc2b4..c09e10c 100644 (file)
--- a/PLC/Methods/UpdateNode.py
+++ b/PLC/Methods/UpdateNode.py
@@ -1,5 +1,3 @@
-# $Id$
-# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
@@ -10,18 +8,18 @@ from PLC.Peers import Peers
 from PLC.Sites import 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
 
 admin_only = [ 'key', 'session', 'boot_nonce', 'site_id']
-can_update = ['hostname', 'node_type', 'boot_state', 'model', 'version'] + admin_only 
+can_update = ['hostname', 'node_type', 'boot_state', 'model', 'version'] + admin_only
 
 class UpdateNode(Method):
     """
     Updates a node. Only the fields specified in node_fields are
     updated, all other fields are left untouched.
-    
+
     PIs and techs can update only the nodes at their sites. Only
     admins can update the key, session, and boot_nonce fields.
 
@@ -45,8 +43,8 @@ class UpdateNode(Method):
     returns = Parameter(int, '1 if successful')
 
     def call(self, auth, node_id_or_hostname, node_fields):
-        
-        # split provided fields 
+
+        # split provided fields
         [native,related,tags,rejected] = Row.split_fields(node_fields,[Node.fields,Node.related_fields,Node.tags])
 
         # type checking
@@ -85,34 +83,35 @@ class UpdateNode(Method):
         node.update(native)
         node.update_last_updated(commit=False)
         node.sync(commit=True)
-        
+
         # if hostname was modifed make sure to update the hrn
         # tag
         if 'hostname' in native:
-            # root authority should be PLC_HRN_ROOT for local
-            # objects or peer['hrn_root'] for peer objects 
             root_auth = self.api.config.PLC_HRN_ROOT
-            if node['peer_id']:
-                peers = Peers(self.api, node['peer_id'], ['hrn_root'])
-                if peers:
-                    root_auth = peers[0]['hrn_root'] 
-                     
             # sub auth is the login base of this node's site
             sites = Sites(self.api, node['site_id'], ['login_base'])
             site = sites[0]
             login_base = site['login_base']
-            tags['hrn'] = hostname_to_hrn(root_auth, login_base, node['hostname']) 
-            
+            tags['hrn'] = hostname_to_hrn(root_auth, login_base, node['hostname'])
+
         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()
         # Logging variables
         self.event_objects = {'Node': [node['node_id']]}
         if 'hostname' in node: