X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FUpdateConfFile.py;h=4e94208ced36e4b1523db7542517a2cfa3e9b9a4;hb=929d1cbbc300f8a33cf0cfe9d6add3b898e0c552;hp=f68e0fecf6ef0e9ee98a23181080086dd8d24269;hpb=ed7fa1ebf97ec2f88f18f8fa538e46c6ae9525c4;p=plcapi.git diff --git a/PLC/Methods/UpdateConfFile.py b/PLC/Methods/UpdateConfFile.py index f68e0fe..4e94208 100644 --- a/PLC/Methods/UpdateConfFile.py +++ b/PLC/Methods/UpdateConfFile.py @@ -2,7 +2,7 @@ from PLC.Faults import * from PLC.Method import Method from PLC.Parameter import Parameter, Mixed from PLC.ConfFiles import ConfFile, ConfFiles -from PLC.Auth import PasswordAuth +from PLC.Auth import Auth can_update = lambda (field, value): field not in \ ['conf_file_id', 'node_ids', 'nodegroup_ids'] @@ -18,11 +18,9 @@ class UpdateConfFile(Method): roles = ['admin'] conf_file_fields = dict(filter(can_update, ConfFile.fields.items())) - for field in conf_file_fields.values(): - field.optional = True accepts = [ - PasswordAuth(), + Auth(), ConfFile.fields['conf_file_id'], conf_file_fields ] @@ -32,12 +30,13 @@ class UpdateConfFile(Method): def call(self, auth, conf_file_id, conf_file_fields): conf_file_fields = dict(filter(can_update, conf_file_fields.items())) - conf_files = ConfFiles(self.api, [conf_file_id]).values() + conf_files = ConfFiles(self.api, [conf_file_id]) if not conf_files: raise PLCInvalidArgument, "No such configuration file" conf_file = conf_files[0] conf_file.update(conf_file_fields) conf_file.sync() + self.object_ids = [conf_file['conf_file_id']] return 1