(most) all functions now take SessionAuth in addition to PasswordAuth

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

diff --git a/PLC/Methods/AddNodeGroup.py b/PLC/Methods/AddNodeGroup.py
index 74ba222..8ea7433 100644 (file)
--- a/PLC/Methods/AddNodeGroup.py
+++ b/PLC/Methods/AddNodeGroup.py
@@ -2,29 +2,39 @@ 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']
 
 class AddNodeGroup(Method):
     """
-    Adds a new node group. Any values specified in optional_vals are used,
-    otherwise defaults are used.
+    Adds a new node group. Any values specified in nodegroup_fields
+    are used, otherwise defaults are used.
 
     Returns the new nodegroup_id (> 0) if successful, faults otherwise.
     """
 
     roles = ['admin']
 
+    nodegroup_fields = dict(filter(can_update, NodeGroup.fields.items()))
+
     accepts = [
-        PasswordAuth(),
-        NodeGroup.fields['name'],
-        NodeGroup.fields['description']
+        Auth(),
+        nodegroup_fields
         ]
 
     returns = Parameter(int, 'New nodegroup_id (> 0) if successful')
 
-    def call(self, auth, name, description):
-       # Create node group
-        nodegroup = NodeGroup(self.api, {'name': name, 'description': description})
+    event_type = 'Add'
+    object_type = 'NodeGroup'
+    object_ids = []
+
+    def call(self, auth, nodegroup_fields):
+        nodegroup_fields = dict(filter(can_update, nodegroup_fields.items()))
+        nodegroup = NodeGroup(self.api, nodegroup_fields)
         nodegroup.sync()
 
+       self.object_ids = [nodegroup['nodegroup_id']]
+
         return nodegroup['nodegroup_id']