X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FUpdateNode.py;h=d5cdb0d449f6178b7d81d7f2b812dc7dded89b04;hb=801d1c69ef9f19c5f2e439e261407d4d28892884;hp=f80b77957f6da84829bc9691c409498e693767df;hpb=40d33ca5c3e174e3ac07e3519c07e43825b4c797;p=plcapi.git

diff --git a/PLC/Methods/UpdateNode.py b/PLC/Methods/UpdateNode.py
index f80b779..d5cdb0d 100644
--- a/PLC/Methods/UpdateNode.py
+++ b/PLC/Methods/UpdateNode.py
@@ -2,56 +2,55 @@ 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
+
+related_fields = Node.related_fields.keys()
+can_update = lambda (field, value): field in \
+             ['hostname', 'boot_state', 'model', 'version',
+              'key', 'session', 'boot_nonce'] + \
+	     related_fields
 
 class UpdateNode(Method):
     """
-    Updates a node. Only the fields specified in update_fields are
+    Updates a node. Only the fields specified in node_fields are
     updated, all other fields are left untouched.
-
-    To remove a value without setting a new one in its place (for
-    example, to remove an address from the node), specify -1 for int
-    and double fields and 'null' for string fields. hostname and
-    boot_state cannot be unset.
     
-    PIs and techs can only update the nodes at their sites.
+    PIs and techs can update only the nodes at their sites. Only
+    admins can update the key, session, and boot_nonce fields.
 
     Returns 1 if successful, faults otherwise.
     """
 
     roles = ['admin', 'pi', 'tech']
 
-    can_update = lambda (field, value): field in \
-                 ['hostname', 'boot_state', 'model', 'version']
-    update_fields = dict(filter(can_update, Node.fields.items()))
+    node_fields = dict(filter(can_update, Node.fields.items() + Node.related_fields.items()))
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Node.fields['node_id'],
               Node.fields['hostname']),
-        update_fields
+        node_fields
         ]
 
     returns = Parameter(int, '1 if successful')
 
-    def call(self, auth, node_id_or_hostname, update_fields):
-        if filter(lambda field: field not in self.update_fields, update_fields):
-            raise PLCInvalidArgument, "Invalid field specified"
+    def call(self, auth, node_id_or_hostname, node_fields):
+        node_fields = dict(filter(can_update, node_fields.items()))
 
-        # XML-RPC cannot marshal None, so we need special values to
-        # represent "unset".
-        for key, value in update_fields.iteritems():
-            if value == -1 or value == "null":
-                if key in ['hostname', 'boot_state']:
-                    raise PLCInvalidArgument, "hostname and boot_state cannot be unset"
-                update_fields[key] = None
+	# 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]
 
         # 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
@@ -62,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(update_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