X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FJSONSchema.pm;fp=src%2FPVE%2FJSONSchema.pm;h=f2ddb50c060805afd6c79ad208005dfd8f7c0fd6;hp=486454976824ec48aaf91274fa60639c10c09196;hb=920750982b5792c184d11b9deb6ec9dd816a39d3;hpb=7a2e8ca127c9f86a0171c627b35c9dc52c228639 diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index 4864549..f2ddb50 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -273,20 +273,26 @@ sub parse_idmap { return $map; } -register_format('storagepair', \&verify_storagepair); -sub verify_storagepair { - my ($storagepair, $noerr) = @_; +my $verify_idpair = sub { + my ($input, $noerr, $format) = @_; - # note: this only checks a single list entry - # when using a storagepair-list map, you need to pass the full - # parameter to parse_idmap - eval { parse_idmap($storagepair, 'pve-storage-id') }; + eval { parse_idmap($input, $format) }; if ($@) { return undef if $noerr; die "$@\n"; } - return $storagepair; + return $input; +}; + +# note: this only checks a single list entry +# when using a storagepair-list map, you need to pass the full parameter to +# parse_idmap +register_format('storagepair', \&verify_storagepair); +sub verify_storagepair { + my ($storagepair, $noerr) = @_; + return $verify_idpair->($storagepair, $noerr, 'pve-storage-id'); +} } register_format('mac-addr', \&pve_verify_mac_addr);