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 31EFB96307 for ; Mon, 15 Apr 2024 14:49:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0B1DE9E70 for ; Mon, 15 Apr 2024 14:48:43 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Mon, 15 Apr 2024 14:48:41 +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 98B6F449C1 for ; Mon, 15 Apr 2024 14:48:41 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 15 Apr 2024 14:48:37 +0200 Message-Id: <20240415124838.68905-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.071 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH storage] plugin: move definition for 'port' option to base plugin 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: Mon, 15 Apr 2024 12:49:13 -0000 Commit 7020491 ("esxi: add 'port' config parameter") started using the 'port' option in a second plugin, but the definition stayed in the PBS plugin. Avoid the hidden dependency and move the definition to the base plugin instead. It is necessary to mark it as optional or it would be required always. Signed-off-by: Fiona Ebner --- src/PVE/Storage/PBSPlugin.pm | 6 ------ src/PVE/Storage/Plugin.pm | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/PVE/Storage/PBSPlugin.pm b/src/PVE/Storage/PBSPlugin.pm index 08ceb88..0808bcc 100644 --- a/src/PVE/Storage/PBSPlugin.pm +++ b/src/PVE/Storage/PBSPlugin.pm @@ -49,12 +49,6 @@ sub properties { description => "Base64-encoded, PEM-formatted public RSA key. Used to encrypt a copy of the encryption-key which will be added to each encrypted backup.", type => 'string', }, - port => { - description => "For non default port.", - type => 'integer', - minimum => 1, - maximum => 65535, - }, }; } diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 22a9729..5f49830 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -205,6 +205,14 @@ my $defaultData = { format => 'pve-storage-options', optional => 1, }, + port => { + description => "For PBS/ESXi, use this port to connect to the storage instead of the" + ." default one.", + type => 'integer', + minimum => 1, + maximum => 65535, + optional => 1, + }, }, }; -- 2.39.2