X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FAddConfFileToNodeGroup.py;h=cdcec8817c0d366f37e8728def34456906ac41f2;hb=8b0a5128b2582b1cf41b123680e8d4ec270ac9a3;hp=32b9f0731dda1a367ce95a74faa87b4cb59c904b;hpb=1f8c38dd1357c93e4be8d94456b7274a591d2db4;p=plcapi.git

diff --git a/PLC/Methods/AddConfFileToNodeGroup.py b/PLC/Methods/AddConfFileToNodeGroup.py
index 32b9f07..cdcec88 100644
--- a/PLC/Methods/AddConfFileToNodeGroup.py
+++ b/PLC/Methods/AddConfFileToNodeGroup.py
@@ -1,3 +1,5 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
@@ -20,33 +22,31 @@ class AddConfFileToNodeGroup(Method):
         Auth(),
         ConfFile.fields['conf_file_id'],
         Mixed(NodeGroup.fields['nodegroup_id'],
-              NodeGroup.fields['name'])
+              NodeGroup.fields['groupname'])
         ]
 
     returns = Parameter(int, '1 if successful')
 
-    event_type = 'AddTo'
-    object_type = 'ConfFile'
-    object_ids = []
 
     def call(self, auth, conf_file_id, nodegroup_id_or_name):
-	# Get configuration file
+        # 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 node
-	nodegroups = NodeGroups(self.api, [nodegroup_id_or_name])
-	if not nodegroups:
+        nodegroups = NodeGroups(self.api, [nodegroup_id_or_name])
+        if not nodegroups:
             raise PLCInvalidArgument, "No such node group"
-	nodegroup = nodegroups.values()[0]
-	
-	# Link configuration file to node
+        nodegroup = nodegroups[0]
+
+        # Link configuration file to node
         if nodegroup['nodegroup_id'] not in conf_file['nodegroup_ids']:
             conf_file.add_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