From: Tony Mack Date: Tue, 6 Nov 2007 03:52:01 +0000 (+0000) Subject: Rationalize: can now update aggregate values (nodenetworks, nodegroups, conf_files... X-Git-Tag: PLCAPI-4.2-0~47 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d212f61684fdb2221858f327f20c6455c5af5e65;p=plcapi.git Rationalize: can now update aggregate values (nodenetworks, nodegroups, conf_files, slices, slices_whitelist) --- diff --git a/PLC/Methods/UpdateNode.py b/PLC/Methods/UpdateNode.py index d8128e0..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(), @@ -59,7 +61,13 @@ 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()