X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FDeleteConfFileFromNodeGroup.py;h=5504b0fc028aa88ffb1debbb346ee21a740431fd;hb=8747a081fef6affa6753dc6cd2778bfc8bc2ebfe;hp=22523dba997fdacca616db4aca90b868c2275403;hpb=1f8c38dd1357c93e4be8d94456b7274a591d2db4;p=plcapi.git

diff --git a/PLC/Methods/DeleteConfFileFromNodeGroup.py b/PLC/Methods/DeleteConfFileFromNodeGroup.py
index 22523db..5504b0f 100644
--- a/PLC/Methods/DeleteConfFileFromNodeGroup.py
+++ b/PLC/Methods/DeleteConfFileFromNodeGroup.py
@@ -24,28 +24,26 @@ 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']:
             conf_file.remove_nodegroup(nodegroup)
 
         # Log affected objects
-        self.object_ids = [conf_file_id, nodegroup['nodegroup_id']]
+        self.event_objects = {'ConfFile': [conf_file_id], 
+			      'NodeGroup': [nodegroup['nodegroup_id']]}
 
         return 1