[pve-devel] [PATCH qemu-server 05/15] move helper for iscsi initiator name to helpers module and improve name

[Fiona Ebner]

Signed-off-by: Fiona Ebner <f.ebner at proxmox.com>
---
 src/PVE/QemuServer.pm                  | 21 ++++-----------------
 src/PVE/QemuServer/Helpers.pm          | 15 +++++++++++++++
 src/test/run_config2command_tests.pl   |  2 +-
 src/test/run_qemu_img_convert_tests.pl |  2 +-
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 71376edc..b67fe832 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -51,7 +51,8 @@ use PVE::Tools
 use PVE::QMPClient;
 use PVE::QemuConfig;
 use PVE::QemuConfig::NoWrite;
-use PVE::QemuServer::Helpers qw(config_aware_timeout min_version kvm_user_version windows_version);
+use PVE::QemuServer::Helpers
+    qw(config_aware_timeout get_iscsi_initiator_name min_version kvm_user_version windows_version);
 use PVE::QemuServer::Cloudinit;
 use PVE::QemuServer::CGroup;
 use PVE::QemuServer::CPUConfig
@@ -1506,20 +1507,6 @@ sub print_drivedevice_full {
     return $device;
 }
 
-sub get_initiator_name {
-    my $initiator;
-
-    my $fh = IO::File->new('/etc/iscsi/initiatorname.iscsi') || return;
-    while (defined(my $line = <$fh>)) {
-        next if $line !~ m/^\s*InitiatorName\s*=\s*([\.\-:\w]+)/;
-        $initiator = $1;
-        last;
-    }
-    $fh->close();
-
-    return $initiator;
-}
-
 sub print_drive_commandline_full {
     my ($storecfg, $vmid, $drive, $live_restore_name) = @_;
 
@@ -4010,7 +3997,7 @@ sub config_to_command {
     my $scsihw = defined($conf->{scsihw}) ? $conf->{scsihw} : $defaults->{scsihw};
 
     # Add iscsi initiator name if available
-    if (my $initiator = get_initiator_name()) {
+    if (my $initiator = get_iscsi_initiator_name()) {
         push @$devices, '-iscsi', "initiator-name=$initiator";
     }
 
@@ -8357,7 +8344,7 @@ sub convert_iscsi_path {
         my $target = $2;
         my $lun = $3;
 
-        my $initiator_name = get_initiator_name();
+        my $initiator_name = get_iscsi_initiator_name();
 
         return "file.driver=iscsi,file.transport=tcp,file.initiator-name=$initiator_name,"
             . "file.portal=$portal,file.target=$target,file.lun=$lun,driver=raw";
diff --git a/src/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm
index 9ec989f7..3e444839 100644
--- a/src/PVE/QemuServer/Helpers.pm
+++ b/src/PVE/QemuServer/Helpers.pm
@@ -16,6 +16,7 @@ use base 'Exporter';
 our @EXPORT_OK = qw(
     min_version
     config_aware_timeout
+    get_iscsi_initiator_name
     kvm_user_version
     parse_number_sets
     windows_version
@@ -296,4 +297,18 @@ sub needs_extraction {
     return $vtype eq 'import' && $fmt =~ m/^ova\+(.*)$/;
 }
 
+sub get_iscsi_initiator_name {
+    my $initiator;
+
+    my $fh = IO::File->new('/etc/iscsi/initiatorname.iscsi') || return;
+    while (defined(my $line = <$fh>)) {
+        next if $line !~ m/^\s*InitiatorName\s*=\s*([\.\-:\w]+)/;
+        $initiator = $1;
+        last;
+    }
+    $fh->close();
+
+    return $initiator;
+}
+
 1;
diff --git a/src/test/run_config2command_tests.pl b/src/test/run_config2command_tests.pl
index 9f4ecabf..52fedd7b 100755
--- a/src/test/run_config2command_tests.pl
+++ b/src/test/run_config2command_tests.pl
@@ -248,7 +248,7 @@ $qemu_server_module->mock(
     get_host_arch => sub() {
         return $current_test->{host_arch} // 'x86_64';
     },
-    get_initiator_name => sub {
+    get_iscsi_initiator_name => sub {
         return 'iqn.1993-08.org.debian:01:aabbccddeeff';
     },
     cleanup_pci_devices => {
diff --git a/src/test/run_qemu_img_convert_tests.pl b/src/test/run_qemu_img_convert_tests.pl
index 55144994..86eb53be 100755
--- a/src/test/run_qemu_img_convert_tests.pl
+++ b/src/test/run_qemu_img_convert_tests.pl
@@ -504,7 +504,7 @@ $qemu_server_module->mock(
     run_command => sub {
         $command = shift;
     },
-    get_initiator_name => sub {
+    get_iscsi_initiator_name => sub {
         return "foobar";
     },
 );
-- 
2.47.2