Fix big leak in type-checking add/update args for taggable classes

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

diff --git a/PLC/Methods/UpdateNode.py b/PLC/Methods/UpdateNode.py
index a562ac3..ecfa6cf 100644 (file)
--- a/PLC/Methods/UpdateNode.py
+++ b/PLC/Methods/UpdateNode.py
@@ -3,9 +3,14 @@ from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Table import Row
-from PLC.Nodes import Node, Nodes
 from PLC.Auth import Auth
 
+from PLC.Nodes import Node, Nodes
+from PLC.TagTypes import TagTypes
+from PLC.NodeTags import NodeTags
+from PLC.Methods.AddNodeTag import AddNodeTag
+from PLC.Methods.UpdateNodeTag import UpdateNodeTag
+
 can_update = ['hostname', 'boot_state', 'model', 'version','key', 'session', 'boot_nonce', 'site_id'] + \
               Node.related_fields.keys()
 
@@ -35,11 +40,13 @@ class UpdateNode(Method):
 
     def call(self, auth, node_id_or_hostname, node_fields):
         
+        node_fields = Row.check_fields (node_fields, self.accepted_fields)
+
         # split provided fields 
         [native,related,tags,rejected] = Row.split_fields(node_fields,[Node.fields,Node.related_fields,Node.tags])
 
         if rejected:
-            raise PLCInvalidArgument, "Cannot update column(s) %r"%rejected
+            raise PLCInvalidArgument, "Cannot update Node column(s) %r"%rejected
 
        # Remove admin only fields
        if 'admin' not in self.caller['roles']:
@@ -69,19 +76,28 @@ class UpdateNode(Method):
         for (k,v) in related.iteritems():
             node.associate(auth, k,v)
 
-        if tags:
-            print 'UpdateNode: warning, tags not handled yet',
-            for (k,v) in tags.iteritems(): print k
-
        node.update(native)
        node.update_last_updated(commit=False)
         node.sync(commit=True)
        
+        for (tagname,value) in tags.iteritems():
+            # the tagtype instance is assumed to exist, just check that
+            if not TagTypes(self.api,{'tagname':tagname}):
+                raise PLCInvalidArgument,"No such TagType %s"%tagname
+            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)
+            else:
+                UpdateNodeTag(self.api).__call__(auth,node_tags[0]['node_tag_id'],value)
+
        # Logging variables
        self.event_objects = {'Node': [node['node_id']]}
-       self.message = 'Node %d updated: %s.' % \
-               (node['node_id'], ", ".join(node_fields.keys()))
+        if 'hostname' in node:
+            self.message = 'Node %s updated'%node['hostname']
+        else:
+            self.message = 'Node %d updated'%node['node_id']
+        self.message += " [%s]." % (", ".join(node_fields.keys()),)
        if 'boot_state' in node_fields.keys():
-               self.message += ' boot_state updated to %s' %  node_fields['boot_state']
+               self.message += ' boot_state updated to %s' % node_fields['boot_state']
 
         return 1