Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

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

diff --git a/PLC/Methods/UpdateNodeGroup.py b/PLC/Methods/UpdateNodeGroup.py
index 6088230..c84c7f1 100644 (file)
--- a/PLC/Methods/UpdateNodeGroup.py
+++ b/PLC/Methods/UpdateNodeGroup.py
@@ -2,10 +2,12 @@ from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.NodeGroups import NodeGroup, NodeGroups
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
+related_fields = NodeGroup.related_fields.keys()
 can_update = lambda (field, value): field in \
-             ['name', 'description']
+             ['name', 'description'] + \
+            related_fields
 
 class UpdateNodeGroup(Method):
     """
@@ -16,10 +18,10 @@ class UpdateNodeGroup(Method):
 
     roles = ['admin']
 
-    nodegroup_fields = dict(filter(can_update, NodeGroup.fields.items()))
+    nodegroup_fields = dict(filter(can_update, NodeGroup.fields.items() + NodeGroup.related_fields.items()))
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(NodeGroup.fields['nodegroup_id'],
              NodeGroup.fields['name']),
         nodegroup_fields
@@ -34,9 +36,19 @@ class UpdateNodeGroup(Method):
        nodegroups = NodeGroups(self.api, [nodegroup_id_or_name])
        if not nodegroups:
             raise PLCInvalidArgument, "No such nodegroup"
-       nodegroup = nodegroups.values()[0]
+       nodegroup = nodegroups[0]
+
+       # Make requested associations
+        for field in related_fields:
+            if field in nodegroup_fields:
+                nodegroup.associate(auth, field, nodegroup_fields[field])
+                nodegroup_fields.pop(field)
        
        nodegroup.update(nodegroup_fields)
         nodegroup.sync()
-
+       
+       # Logging variables
+       self.event_objects = {'NodeGroup': [nodegroup['nodegroup_id']]}
+       self.message = 'Node group %d updated: %s' % \
+               (nodegroup['nodegroup_id'], ", ".join(nodegroup_fields.keys()))  
         return 1