From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 343371FF13C for ; Thu, 30 Apr 2026 19:32:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 25F1E15307; Thu, 30 Apr 2026 19:32:32 +0200 (CEST) From: Mira Limbeck To: pve-devel@lists.proxmox.com Subject: [PATCH v2 storage 04/15] iscsi: introduce mapping support Date: Thu, 30 Apr 2026 19:27:02 +0200 Message-ID: <20260430173220.441001-5-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260430173220.441001-1-m.limbeck@proxmox.com> References: <20260430173220.441001-1-m.limbeck@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.589 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Message-ID-Hash: NJP5KPOYZF6VMDCOZEST2HTGMGCKM4EX X-Message-ID-Hash: NJP5KPOYZF6VMDCOZEST2HTGMGCKM4EX X-MailFrom: mira@nena.proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: `portal` and `target` should be optional then. There is no need for those when a mapping is specified. In return the config needs to be checked to make sure either portal and target are defined, or a mapping. Signed-off-by: Mira Limbeck --- src/PVE/Storage/ISCSIPlugin.pm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm index 30f4178..88a35be 100644 --- a/src/PVE/Storage/ISCSIPlugin.pm +++ b/src/PVE/Storage/ISCSIPlugin.pm @@ -9,6 +9,7 @@ use IO::File; use PVE::JSONSchema qw(get_standard_option); use PVE::Storage::Plugin; +use PVE::Storage::Mapping; use PVE::Tools qw(run_command file_read_firstline trim dir_glob_regex dir_glob_foreach $IPV4RE $IPV6RE); @@ -354,8 +355,9 @@ sub properties { sub options { return { - portal => { fixed => 1 }, - target => { fixed => 1 }, + portal => { fixed => 1, optional => 1 }, + target => { fixed => 1, optional => 1 }, + mapping => { optional => 1 }, nodes => { optional => 1 }, disable => { optional => 1 }, content => { optional => 1 }, @@ -703,4 +705,16 @@ sub volume_import { die "volume import is not possible on iscsi storage\n"; } +sub check_config { + my ($class, $sectionId, $config, $create, $skipSchemaCheck) = @_; + + my $checked = $class->SUPER::check_config($sectionId, $config, $create, $skipSchemaCheck); + + # check if either target or mapping is set + die "iscsi storage '$sectionId' has neither 'target' nor 'mapping' defined\n" + if !defined($checked->{target}) && !defined($checked->{mapping}); + + return $checked; +} + 1; -- 2.47.3