- added logging variable 'object_type'

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

diff --git a/PLC/Methods/UpdateNode.py b/PLC/Methods/UpdateNode.py
index 3566a42..b82325e 100644 (file)
--- 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,7 +14,7 @@ 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.
     """
@@ -22,11 +22,9 @@ class UpdateNode(Method):
     roles = ['admin', 'pi', 'tech']
 
     node_fields = dict(filter(can_update, Node.fields.items()))
-    for field in node_fields.values():
-        field.optional = True
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Node.fields['node_id'],
               Node.fields['hostname']),
         node_fields
@@ -34,20 +32,24 @@ 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()))
 
        # Remove admin only fields
        if 'admin' not in self.caller['roles']:
-            for key in 'key', 'session':
+            for key in 'key', 'session', 'boot_nonce':
                 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
@@ -60,5 +62,12 @@ class UpdateNode(Method):
 
         node.update(node_fields)
         node.sync()
+       
+       # Logging variables
+       self.object_ids = [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