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 749641FF13C for ; Thu, 30 Apr 2026 19:32:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2C55D1534E; Thu, 30 Apr 2026 19:32:33 +0200 (CEST) From: Mira Limbeck To: pve-devel@lists.proxmox.com Subject: [PATCH v2 storage 05/15] iscsi: add helper to get local config Date: Thu, 30 Apr 2026 19:27:03 +0200 Message-ID: <20260430173220.441001-6-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.579 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: EWOH5ICLRQ6FA4NW227R37SPB67HRLLJ X-Message-ID-Hash: EWOH5ICLRQ6FA4NW227R37SPB67HRLLJ 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: local config contains either the targets and portals configured via mapping for the local node or the ones configured via regular iSCSI storage configuration to help differentiate between a mapping and a simple iSCSI storage configuration, is_mapping is set in the local config Signed-off-by: Mira Limbeck --- src/PVE/Storage/ISCSIPlugin.pm | 43 ++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm index 88a35be..8e5cbfb 100644 --- a/src/PVE/Storage/ISCSIPlugin.pm +++ b/src/PVE/Storage/ISCSIPlugin.pm @@ -36,6 +36,49 @@ my sub assert_iscsi_support { # Example: 192.168.122.252:3260,1 iqn.2003-01.org.linux-iscsi.proxmox-nfs.x8664:sn.00567885ba8f my $ISCSI_TARGET_RE = qr/^(\S+:\d+)\,\S+\s+(\S+)\s*$/; +my $get_local_config = sub { + my ($scfg) = @_; + + die "neither 'target' nor 'mapping' defined\n" + if !defined($scfg->{target}) && !defined($scfg->{mapping}); + + my $res = {}; + if ($scfg->{mapping}) { + $res->{is_mapping} = 1; + + my $local_mappings = + PVE::Storage::Mapping::find_mapping_on_current_node($scfg->{mapping}); + die "no iSCSI per-node entries found for mapping '$scfg->{mapping}'\n" + if !$local_mappings->@*; + + for my $mapping ($local_mappings->@*) { + $res->{targets}->{ $mapping->{target} } = [] + if !defined($res->{targets}->{ $mapping->{target} }); + my $portals = [PVE::Tools::split_list($mapping->{portals})]; + + my $add_port = sub { + my ($val) = @_; + + my ($ip, $port) = PVE::Tools::parse_host_and_port($val); + if (defined($port)) { + return $val; + } else { + # add default port + return $ip . ':3260'; + } + }; + $portals->@* = map { $add_port->($_) } $portals->@*; + + push $res->{targets}->{ $mapping->{target} }->@*, $portals->@*; + } + return $res; + } else { + $res->{is_mapping} = 0; + $res->{targets}->{ $scfg->{target} } = iscsi_portals($scfg->{target}, $scfg->{portal}); + return $res; + } +}; + sub iscsi_session_list { assert_iscsi_support(); -- 2.47.3