X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FDeleteConfFileFromNodeGroup.py;h=96398a94e4adaaaa411fceb071a3971d1cb3bfd0;hb=e5831ff536668c94f108435395550f6339452ed6;hp=5504b0fc028aa88ffb1debbb346ee21a740431fd;hpb=41063c2352286a103b95821293a961f219900f39;p=plcapi.git diff --git a/PLC/Methods/DeleteConfFileFromNodeGroup.py b/PLC/Methods/DeleteConfFileFromNodeGroup.py index 5504b0f..96398a9 100644 --- a/PLC/Methods/DeleteConfFileFromNodeGroup.py +++ b/PLC/Methods/DeleteConfFileFromNodeGroup.py @@ -19,31 +19,31 @@ class DeleteConfFileFromNodeGroup(Method): Auth(), ConfFile.fields['conf_file_id'], Mixed(NodeGroup.fields['nodegroup_id'], - NodeGroup.fields['name']) + NodeGroup.fields['groupname']) ] returns = Parameter(int, '1 if successful') 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" + raise PLCInvalidArgument("No such configuration file") 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[0] - - # Link configuration file to nodegroup + nodegroups = NodeGroups(self.api, [nodegroup_id_or_name]) + if not nodegroups: + raise PLCInvalidArgument("No such nodegroup") + 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.event_objects = {'ConfFile': [conf_file_id], - 'NodeGroup': [nodegroup['nodegroup_id']]} + self.event_objects = {'ConfFile': [conf_file_id], + 'NodeGroup': [nodegroup['nodegroup_id']]} return 1