(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 75d4d91..8ea7433 100644 (file)
--- a/PLC/Methods/AddNodeGroup.py
+++ b/PLC/Methods/AddNodeGroup.py
@@ -2,10 +2,10 @@ 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 \
-             ['description']
+             ['name', 'description']
 
 class AddNodeGroup(Method):
     """
@@ -17,12 +17,11 @@ class AddNodeGroup(Method):
 
     roles = ['admin']
 
-    update_fields = dict(filter(can_update, NodeGroup.fields.items()))
+    nodegroup_fields = dict(filter(can_update, NodeGroup.fields.items()))
 
     accepts = [
-        PasswordAuth(),
-        NodeGroup.fields['name'],
-        update_fields
+        Auth(),
+        nodegroup_fields
         ]
 
     returns = Parameter(int, 'New nodegroup_id (> 0) if successful')
@@ -31,11 +30,11 @@ class AddNodeGroup(Method):
     object_type = 'NodeGroup'
     object_ids = []
 
-    def call(self, auth, name, nodegroup_fields = {}):
+    def call(self, auth, nodegroup_fields):
         nodegroup_fields = dict(filter(can_update, nodegroup_fields.items()))
         nodegroup = NodeGroup(self.api, nodegroup_fields)
-        nodegroup['name'] = name
         nodegroup.sync()
+
        self.object_ids = [nodegroup['nodegroup_id']]
 
         return nodegroup['nodegroup_id']