X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FUpdateNode.py;h=34bae4faf62461f572529870353aa2d35616fcc3;hb=55b03f96204cbe7f512ff890f7df9da6e841da57;hp=28a04131f4d9b122e28dd8b9140aeb24e8e225fa;hpb=9c8afbd94fac7c0f0c185eca8a1a4f404baff6d1;p=plcapi.git

diff --git a/PLC/Methods/UpdateNode.py b/PLC/Methods/UpdateNode.py
index 28a0413..34bae4f 100644
--- a/PLC/Methods/UpdateNode.py
+++ b/PLC/Methods/UpdateNode.py
@@ -1,12 +1,17 @@
+# $Id$
 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.TagTypes import TagTypes
+from PLC.NodeTags import NodeTags
+from PLC.Methods.AddNodeTag import AddNodeTag
+from PLC.Methods.UpdateNodeTag import UpdateNodeTag
 
-can_update = lambda (field, value): field in \
-             ['hostname', 'boot_state', 'model', 'version',
-              'key', 'session', 'boot_nonce']
+can_update = ['hostname', 'boot_state', 'model', 'version','key', 'session', 'boot_nonce', 'site_id'] + \
+              Node.related_fields.keys()
 
 class UpdateNode(Method):
     """
@@ -21,7 +26,7 @@ class UpdateNode(Method):
 
     roles = ['admin', 'pi', 'tech']
 
-    node_fields = dict(filter(can_update, Node.fields.items()))
+    node_fields = Row.accepted_fields(can_update,[Node.fields,Node.related_fields,Node.tags])
 
     accepts = [
         Auth(),
@@ -32,25 +37,28 @@ class UpdateNode(Method):
 
     returns = Parameter(int, '1 if successful')
 
-    object_type = 'Node'
-
     def call(self, auth, node_id_or_hostname, node_fields):
-        node_fields = dict(filter(can_update, node_fields.items()))
+        
+        # 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
 
 	# Remove admin only fields
 	if 'admin' not in self.caller['roles']:
-            for key in 'key', 'session', 'boot_nonce':
-                if node_fields.has_key(key):
-                    del node_fields[key]
+            for key in 'key', 'session', 'boot_nonce', 'site_id':
+                if native.has_key(key):
+                    del native[key]
 
         # Get account information
         nodes = Nodes(self.api, [node_id_or_hostname])
         if not nodes:
-            raise PLCInvalidArgument, "No such node"
+            raise PLCInvalidArgument, "No such node %r"%node_id_or_hostname
         node = nodes[0]
 
         if node['peer_id'] is not None:
-            raise PLCInvalidArgument, "Not a local node"
+            raise PLCInvalidArgument, "Not a local node %r"%node_id_or_hostname
 
         # Authenticated function
         assert self.caller is not None
@@ -61,14 +69,29 @@ class UpdateNode(Method):
             if node['site_id'] not in self.caller['site_ids']:
                 raise PLCPermissionDenied, "Not allowed to delete nodes from specified site"
 
-        node.update(node_fields)
-        node.sync()
+        # Make requested associations
+        for (k,v) in related.iteritems():
+            node.associate(auth, k,v)
+
+	node.update(native)
+	node.update_last_updated(commit=False)
+        node.sync(commit=True)
 	
 	# Logging variables
-	self.object_ids = [node['node_id']]
+	self.event_objects = {'Node': [node['node_id']]}
 	self.message = 'Node %d updated: %s.' % \
 		(node['node_id'], ", ".join(node_fields.keys()))
 	if 'boot_state' in node_fields.keys():
 		self.message += ' boot_state updated to %s' %  node_fields['boot_state']
 
+        for (tagname,tagvalue) 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,tagvalue)
+            else:
+                UpdateNodeTag(self.api).__call__(auth,node_tags[0]['node_tag_id'],tagvalue)
+
         return 1