[PATCH pve-stoage 3/4] iscsiPlugin: add wwid

[Felix Driessler <fdriessler@inett.de>]

Signed-off-by: Felix Driessler <fdriessler@inett.de>
---
 src/PVE/Storage/ISCSIPlugin.pm | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm
index 30f4178..bb5576b 100644
--- a/src/PVE/Storage/ISCSIPlugin.pm
+++ b/src/PVE/Storage/ISCSIPlugin.pm
@@ -305,13 +305,21 @@ sub iscsi_device_list {
 
                     my $volid = "$channel.$id.$lun.$blockdev";
 
+                    my $wwid = '';
+                    my $dev = "/dev/$bdev";
+                    $dev =~ m|^(/dev/[A-Za-z0-9_\-./]+)$|
+                        or die "Invalid device path";
+                    $dev = $1;
+                    run_command(['/lib/udev/scsi_id', '-g', '-u', '-d', $dev], outfunc => sub { $wwid .= "$_[0]" });
+
                     $res->{$target}->{$volid} = {
-                        'format' => 'raw',
-                        'size' => int($size * 512),
-                        'vmid' => 0, # not assigned to any vm
-                        'channel' => int($channel),
-                        'id' => int($id),
-                        'lun' => int($lun),
+                        'format'    => 'raw',
+                        'size'      => int($size * 512),
+                        'vmid'      => 0, # not assigned to any vm
+                        'channel'   => int($channel),
+                        'id'        => int($id),
+                        'lun'       => int($lun),
+                        'wwid'      => $wwid
                     };
 
                     #print "TEST: $target $session $host,$bus,$tg,$lun $blockdev\n";
-- 
2.52.0



Felix Driessler
Junior Systems Engineer // #GernPerDU

Linux - Open Source - IT Solutions

T: +49-681-410993-0
E: fdriessler@inett.de
https://www.inett.de



inett GmbH | Altenkesseler Strasse 17 / B8 | 66115 Saarbrücken | Germany

Vertrieb: vertrieb@inett.de // +49-681-410993-33
Support: support@inett.de // +49-681-410993-42





Geschäftsführung: Marco Gabriel | Amtsgericht Saarbrücken HRB 16588