This commit was manufactured by cvs2svn to create branch

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

diff --git a/PLC/Methods/UpdateNodeGroup.py b/PLC/Methods/UpdateNodeGroup.py
index e84d98e..5d31026 100644 (file)
--- a/PLC/Methods/UpdateNodeGroup.py
+++ b/PLC/Methods/UpdateNodeGroup.py
@@ -2,7 +2,7 @@ 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
 
 can_update = lambda (field, value): field in \
              ['name', 'description']
@@ -17,11 +17,9 @@ class UpdateNodeGroup(Method):
     roles = ['admin']
 
     nodegroup_fields = dict(filter(can_update, NodeGroup.fields.items()))
-    for field in nodegroup_fields.values():
-        field.optional = True
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(NodeGroup.fields['nodegroup_id'],
              NodeGroup.fields['name']),
         nodegroup_fields
@@ -29,16 +27,20 @@ class UpdateNodeGroup(Method):
 
     returns = Parameter(int, '1 if successful')
 
-    def call(self, auth, nodegroup_id_or_name, nodegroup_fields = {}):
+    def call(self, auth, nodegroup_id_or_name, nodegroup_fields):
         nodegroup_fields = dict(filter(can_update, nodegroup_fields.items()))
 
        # Get nodegroup information
        nodegroups = NodeGroups(self.api, [nodegroup_id_or_name])
        if not nodegroups:
             raise PLCInvalidArgument, "No such nodegroup"
-       nodegroup = nodegroups.values()[0]
+       nodegroup = nodegroups[0]
        
        nodegroup.update(nodegroup_fields)
         nodegroup.sync()
-
+       
+       # Logging variables
+       self.object_ids = [nodegroup['nodegroup_id']]
+       self.message = 'Node group %d updated: %s' % \
+               (nodegroup['nodegroup_id'], ", ".join(nodegroup_fields.keys()))  
         return 1