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 AE69472A48 for ; Tue, 13 Apr 2021 14:16:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A8E752A7E2 for ; Tue, 13 Apr 2021 14:16:54 +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 F34572A750 for ; Tue, 13 Apr 2021 14:16:52 +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 B466845A73 for ; Tue, 13 Apr 2021 14:16:52 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 13 Apr 2021 14:16:30 +0200 Message-Id: <20210413121640.3602975-13-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 2/2] schema: add pve-bridge-id option/format/pair 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:16:54 -0000 for re-use in qemu-server/pve-container, which already have this option duplicated. the '-pair' is needed for remote migration, but can also be a nice addition to regular intra-cluster migration to lift the restriction of having identically named bridges. Signed-off-by: Fabian Grünbichler --- src/PVE/JSONSchema.pm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index f2ddb50..bf30b33 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -82,6 +82,12 @@ register_standard_option('pve-storage-id', { type => 'string', format => 'pve-storage-id', }); +register_standard_option('pve-bridge-id', { + description => "Bridge to attach guest network devices to.", + type => 'string', format => 'pve-bridge-id', + format_description => 'bridge', +}); + register_standard_option('pve-config-digest', { description => 'Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.', type => 'string', @@ -193,6 +199,17 @@ sub parse_storage_id { return parse_id($storeid, 'storage', $noerr); } +PVE::JSONSchema::register_format('pve-bridge-id', \&parse_bridge_id); +sub parse_bridge_id { + my ($id, $noerr) = @_; + + if ($id !~ m/^[-_.\w\d]+$/) { + return undef if $noerr; + die "invalid bridge ID '$id'\n"; + } + return $id; +} + PVE::JSONSchema::register_format('acme-plugin-id', \&parse_acme_plugin_id); sub parse_acme_plugin_id { my ($pluginid, $noerr) = @_; @@ -293,6 +310,14 @@ sub verify_storagepair { my ($storagepair, $noerr) = @_; return $verify_idpair->($storagepair, $noerr, 'pve-storage-id'); } + +# note: this only checks a single list entry +# when using a bridgepair-list map, you need to pass the full parameter to +# parse_idmap +register_format('bridgepair', \&verify_bridgepair); +sub verify_bridgepair { + my ($bridgepair, $noerr) = @_; + return $verify_idpair->($bridgepair, $noerr, 'pve-bridge-id'); } register_format('mac-addr', \&pve_verify_mac_addr); -- 2.20.1