From: Mira Limbeck <m.limbeck@proxmox.com>
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 [thread overview]
Message-ID: <20260430173220.441001-6-m.limbeck@proxmox.com> (raw)
In-Reply-To: <20260430173220.441001-1-m.limbeck@proxmox.com>
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 <m.limbeck@proxmox.com>
---
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
next prev parent reply other threads:[~2026-04-30 17:32 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-30 17:26 [PATCH v2 cluster/storage/manager 00/15] storage mapping Mira Limbeck
2026-04-30 17:26 ` [PATCH v2 cluster 01/15] mapping: add storage.cfg Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 02/15] mapping: add base plugin Mira Limbeck
2026-04-30 17:35 ` Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 03/15] mapping: add iSCSI plugin Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 04/15] iscsi: introduce mapping support Mira Limbeck
2026-04-30 17:27 ` Mira Limbeck [this message]
2026-04-30 17:27 ` [PATCH v2 storage 06/15] iscsi: change functions to handle mappings Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 07/15] iscsi: introduce helper to update discovery db Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 08/15] iscsi: rework to update discovery db and simplify login Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 09/15] iscsi: remove stale sessions in non-mapping case Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 10/15] api: add mapping support Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 11/15] mapping: iscsi: add discovery-portal config option Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 12/15] iscsi: add support for non-persistent discovery Mira Limbeck
2026-04-30 17:38 ` Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 storage 13/15] api: add non-persistent iscsi discovery option Mira Limbeck
2026-04-30 17:27 ` [POC v2 storage 14/15] mapping: add zfspool plugin Mira Limbeck
2026-04-30 17:27 ` [PATCH v2 manager 15/15] api: mapping: add storage mapping path Mira Limbeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260430173220.441001-6-m.limbeck@proxmox.com \
--to=m.limbeck@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox