X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FUpdateNode.py;h=b20d3c55f2326b9dcbeaa2b0ae3d113c74c76538;hb=32a7859efc899b826dc5d7a7cde4f7e0606e09ee;hp=c8be8db0a99ac518b35252a9fda809176b1a6592;hpb=464bdadeb5955571f22e941c7d89b1d962ac9511;p=plcapi.git

diff --git a/PLC/Methods/UpdateNode.py b/PLC/Methods/UpdateNode.py
index c8be8db..b20d3c5 100644
--- a/PLC/Methods/UpdateNode.py
+++ b/PLC/Methods/UpdateNode.py
@@ -2,11 +2,11 @@ from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Nodes import Node, Nodes
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 can_update = lambda (field, value): field in \
              ['hostname', 'boot_state', 'model', 'version',
-              'key', 'session']
+              'key', 'session', 'boot_nonce']
 
 class UpdateNode(Method):
     """
@@ -14,20 +14,20 @@ class UpdateNode(Method):
     updated, all other fields are left untouched.
     
     PIs and techs can update only the nodes at their sites. Only
-    admins can update the key and session fields.
+    admins can update the key, session, and boot_nonce fields.
 
     Returns 1 if successful, faults otherwise.
     """
 
     roles = ['admin', 'pi', 'tech']
 
-    update_fields = dict(filter(can_update, Node.fields.items()))
+    node_fields = dict(filter(can_update, Node.fields.items()))
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Node.fields['node_id'],
               Node.fields['hostname']),
-        update_fields
+        node_fields
         ]
 
     returns = Parameter(int, '1 if successful')
@@ -37,15 +37,18 @@ class UpdateNode(Method):
 
 	# Remove admin only fields
 	if 'admin' not in self.caller['roles']:
-            for key in 'key', 'session':
-                del node_fields[key]
+            for key in 'key', 'session', 'boot_nonce':
+                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]
 
-        node = nodes.values()[0]
+        if node['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local node"
 
         # Authenticated function
         assert self.caller is not None
@@ -58,5 +61,12 @@ class UpdateNode(Method):
 
         node.update(node_fields)
         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