comment

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

diff --git a/PLC/Methods/UpdateNode.py b/PLC/Methods/UpdateNode.py
index 0e40564..d6c9e45 100644 (file)
--- a/PLC/Methods/UpdateNode.py
+++ b/PLC/Methods/UpdateNode.py
@@ -1,12 +1,15 @@
+# $Id$
 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 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', 'site_id'] + \
+            related_fields
 
 class UpdateNode(Method):
     """
@@ -21,7 +24,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(),
@@ -33,20 +36,24 @@ class UpdateNode(Method):
     returns = Parameter(int, '1 if successful')
 
     def call(self, auth, node_id_or_hostname, node_fields):
-        node_fields = dict(filter(can_update, node_fields.items()))
+        
+       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', 'boot_nonce':
-                del node_fields[key]
+            for key in 'key', 'session', 'boot_nonce', 'site_id':
+                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,8 +63,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()
-       self.object_ids = [node['node_id']]
+       
+       # 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