X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FUpdateNode.py;h=d5cdb0d449f6178b7d81d7f2b812dc7dded89b04;hb=refs%2Fheads%2Fplanetlab-4_0-branch;hp=ae42bb03cff9ecbe9b0e7007d0ebe50e454dbb19;hpb=e347fc823bbba9d88a3fddf07d5c21024dfd1e55;p=plcapi.git

diff --git a/PLC/Methods/UpdateNode.py b/PLC/Methods/UpdateNode.py
index ae42bb0..d5cdb0d 100644
--- a/PLC/Methods/UpdateNode.py
+++ b/PLC/Methods/UpdateNode.py
@@ -4,9 +4,11 @@ from PLC.Parameter import Parameter, Mixed
 from PLC.Nodes import Node, Nodes
 from PLC.Auth import Auth
 
+related_fields = Node.related_fields.keys()
 can_update = lambda (field, value): field in \
              ['hostname', 'boot_state', 'model', 'version',
-              'key', 'session', 'boot_nonce']
+              'key', 'session', 'boot_nonce'] + \
+	     related_fields
 
 class UpdateNode(Method):
     """
@@ -21,7 +23,7 @@ class UpdateNode(Method):
 
     roles = ['admin', 'pi', 'tech']
 
-    node_fields = dict(filter(can_update, Node.fields.items()))
+    node_fields = dict(filter(can_update, Node.fields.items() + Node.related_fields.items()))
 
     accepts = [
         Auth(),
@@ -38,15 +40,18 @@ class UpdateNode(Method):
 	# Remove admin only fields
 	if 'admin' not in self.caller['roles']:
             for key in 'key', 'session', 'boot_nonce':
-                del node_fields[key]
+                if node_fields.has_key(key):
+                    del node_fields[key]
 
         # Get account information
         nodes = Nodes(self.api, [node_id_or_hostname])
         if not nodes:
             raise PLCInvalidArgument, "No such node"
-
         node = nodes[0]
 
+        if node['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local node"
+
         # Authenticated function
         assert self.caller is not None
 
@@ -56,7 +61,21 @@ 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)
+        # Make requested associations
+        for field in related_fields:
+            if field in node_fields:
+                node.associate(auth, field, node_fields[field])
+                node_fields.pop(field)
+
+	node.update(node_fields)
+	node.update_last_updated(False)
         node.sync()
+	
+	# Logging variables
+	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']
 
         return 1