X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FDeleteConfFileFromNodeGroup.py;h=1b4e8909a9006243ac4f99359ec1032ec8b7aa1f;hb=e25d1555c7f4854e71f3082da697eb0b0f3c7733;hp=183d431c34afeba8b3e21cbe47fa5e976abacff6;hpb=ed7fa1ebf97ec2f88f18f8fa538e46c6ae9525c4;p=plcapi.git

diff --git a/PLC/Methods/DeleteConfFileFromNodeGroup.py b/PLC/Methods/DeleteConfFileFromNodeGroup.py
index 183d431..1b4e890 100644
--- a/PLC/Methods/DeleteConfFileFromNodeGroup.py
+++ b/PLC/Methods/DeleteConfFileFromNodeGroup.py
@@ -3,7 +3,7 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.ConfFiles import ConfFile, ConfFiles
 from PLC.NodeGroups import NodeGroup, NodeGroups
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 class DeleteConfFileFromNodeGroup(Method):
     """
@@ -16,7 +16,7 @@ class DeleteConfFileFromNodeGroup(Method):
     roles = ['admin']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         ConfFile.fields['conf_file_id'],
         Mixed(NodeGroup.fields['nodegroup_id'],
               NodeGroup.fields['name'])
@@ -24,22 +24,19 @@ class DeleteConfFileFromNodeGroup(Method):
 
     returns = Parameter(int, '1 if successful')
 
-    event_type = 'DeleteFrom'
-    object_type = 'ConfFile'
-    object_ids = []
 
     def call(self, auth, conf_file_id, nodegroup_id_or_name):
 	# Get configuration file
         conf_files = ConfFiles(self.api, [conf_file_id])
         if not conf_files:
             raise PLCInvalidArgument, "No such configuration file"
-        conf_file = conf_files.values()[0]
+        conf_file = conf_files[0]
 
         # Get nodegroup
 	nodegroups = NodeGroups(self.api, [nodegroup_id_or_name])
 	if not nodegroups:
 		raise PLCInvalidArgument, "No such nodegroup"
-	nodegroup = nodegroups.values()[0]
+	nodegroup = nodegroups[0]
 	
 	# Link configuration file to nodegroup
         if nodegroup['nodegroup_id'] in conf_file['nodegroup_ids']: