From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 804AB72AE6 for ; Tue, 13 Apr 2021 14:17:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6E9482A90D for ; Tue, 13 Apr 2021 14:16:56 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id EFF752A6EC for ; Tue, 13 Apr 2021 14:16:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BCD8245A72 for ; Tue, 13 Apr 2021 14:16:51 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 13 Apr 2021 14:16:29 +0200 Message-Id: <20210413121640.3602975-12-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210413121640.3602975-1-f.gruenbichler@proxmox.com> References: <20210413121640.3602975-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [jsonschema.pm] Subject: [pve-devel] [PATCH common 1/2] schema: pull out abstract 'id-pair' verifier X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Apr 2021 12:17:26 -0000 we'll need another one for guest bridge IDs Signed-off-by: Fabian Grünbichler --- src/PVE/JSONSchema.pm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) 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); -- 2.20.1