revised type-checking on taggable classes - previous code would reject any tag

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

diff --git a/PLC/Methods/AddNode.py b/PLC/Methods/AddNode.py
index a7f7406..d25e8b2 100644 (file)
--- a/PLC/Methods/AddNode.py
+++ b/PLC/Methods/AddNode.py
@@ -1,12 +1,16 @@
 # $Id$
 from PLC.Faults import *
+from PLC.Auth import Auth
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Table import Row
-from PLC.Nodes import Node, Nodes
-from PLC.NodeGroups import NodeGroup, NodeGroups
+
 from PLC.Sites import Site, Sites
-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', 'node_type', 'boot_state', 'model', 'version']
 
@@ -23,7 +27,8 @@ class AddNode(Method):
 
     roles = ['admin', 'pi', 'tech']
 
-    accepted_fields = Row.accepted_fields(can_update, [Node.fields,Node.tags])
+    accepted_fields = Row.accepted_fields(can_update,Node.fields)
+    accepted_fields.update(Node.tags)
 
     accepts = [
         Auth(),
@@ -38,6 +43,8 @@ class AddNode(Method):
 
         [native,tags,rejected]=Row.split_fields(node_fields,[Node.fields,Node.tags])
 
+        # type checking
+        native = Row.check_fields (native, self.accepted_fields)
         if rejected:
             raise PLCInvalidArgument, "Cannot add Node with column(s) %r"%rejected
 
@@ -64,10 +71,15 @@ class AddNode(Method):
         node['site_id'] = site['site_id']
         node.sync()
 
-        if tags:
-            print 'AddNode: warning, tags not handled yet'
-            for (k,v) in tags.iteritems():
-                print 'tag',k,v
+        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)
 
        self.event_objects = {'Site': [site['site_id']],
                             'Node': [node['node_id']]}