Merge pull request #1009 from jonludlam/CA-98528

CA-98528: Improve the CLI error message when setting vmpp params

Author: Jon Ludlam

ocaml/client_records/record_util.ml

@@ -431,15 +431,17 @@ let on_boot_to_string onboot =
 		| `reset -> "reset"
 		| `persist -> "persist"
 
+let wrap f err x = try f x with _ -> err x
+let generic_error x = raise (Record_failure ("Unknown value: "^x))
 let rpc_to_string = function | Rpc.String s -> s | _ -> failwith "Bad RPC type in record_util"
 let backup_type_to_string t = rpc_to_string (API.rpc_of_vmpp_backup_type t)
-let string_to_backup_type s = API.vmpp_backup_type_of_rpc (Rpc.String s)
+let string_to_backup_type = wrap (fun s -> API.vmpp_backup_type_of_rpc (Rpc.String s)) generic_error
 let backup_frequency_to_string t = rpc_to_string (API.rpc_of_vmpp_backup_frequency t)
-let string_to_backup_frequency s = API.vmpp_backup_frequency_of_rpc (Rpc.String s)
+let string_to_backup_frequency = wrap (fun s -> API.vmpp_backup_frequency_of_rpc (Rpc.String s)) generic_error
 let archive_frequency_to_string t = rpc_to_string (API.rpc_of_vmpp_archive_frequency t)
-let string_to_archive_frequency s = API.vmpp_archive_frequency_of_rpc (Rpc.String s)
+let string_to_archive_frequency = wrap (fun s -> API.vmpp_archive_frequency_of_rpc (Rpc.String s)) generic_error
 let archive_target_type_to_string t = rpc_to_string (API.rpc_of_vmpp_archive_target_type t)
-let string_to_archive_target_type s = API.vmpp_archive_target_type_of_rpc (Rpc.String s)
+let string_to_archive_target_type = wrap (fun s -> API.vmpp_archive_target_type_of_rpc (Rpc.String s)) generic_error
 
 (** Parse a string which might have a units suffix on the end *)
 let bytes_of_string field x =