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

[Felix Driessler - inett GmbH <fdriessler@inett.de>]

From: Felix Driessler <fdriessler@inett.de><mailto:fdriessler@inett.de>

Signed-off-by: Felix Driessler <fdriessler@inett.de><mailto: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),
+                        'wwid' => $wwid,
                     };

                     #print "TEST: $target $session $host,$bus,$tg,$lun $blockdev\n";

--
2.52.0




Felix Driessler
Junior Systems Engineer // #GernPerDU

[cid:inett_mail-signatur_e61f8e78-8da7-4010-bba4-70b3c208ea37.jpg]
[cid:linkedin_68516854-2409-4a36-a6b3-251a0eb72b1b.png]<https://www.linkedin.com/company/inett-gmbh>[cid:instagram_5f9ae183-9373-47c6-bb29-836f13e95d45.png]<https://www.instagram.com/inettgmbh/>[cid:facebook_f468e002-87f7-4b8e-8e0f-c80a1678f2b5.png]<https://www.facebook.com/inettgmbh>
        inett GmbH
Altenkesseler Str. 17 / B8
66115 Saarbrücken | Germany
E: fdriessler@inett.de<mailto:fdriessler@inett.de>
T: +49-681-410993-0<tel:+496814109930> | www.inett.de<https://www.inett.de>

Vertrieb
E-Mail: vertrieb@inett.de<mailto:vertrieb@inett.de>
Telefon: +49-681-410993-33<tel:+4968141099333>

Support
E-Mail: support@inett.de<mailto:support@inett.de>
Telefon: +49-681-410993-42<tel:+4968141099342>




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