fix: Fix Storage inventory support on FreeBSD

Closes #1050

Author: g-bougard

Changes

@@ -34,6 +34,7 @@ inventory:
 * Fix additional content merged into json even when not required on partial content
 * Update support for Acer S240L monitors inventory
 * Don't inventory Surface Display as monitor on windows
+* fix #1050: Fix Storage inventory support on FreeBSD
 
 remoteinventory:
 * fix RedHat RHN systemid set as WINPRODID

lib/GLPI/Agent/Task/Inventory/BSD/Storages.pm

@@ -50,7 +50,7 @@ sub _getStorages {
                 if ($geom->{provider}
                     && $geom->{provider}->{config}
                     && $geom->{provider}->{config}->{descr});
-            $device->{DISKSIZE} = $geom->{provider}->{mediasize}
+            $device->{DISKSIZE} = getCanonicalSize($geom->{provider}->{mediasize}."bytes")
                 if ($geom->{provider}
                     && defined $geom->{provider}->{mediasize});
             $device->{TYPE} = _retrieveDeviceTypeFromName($device->{NAME});
@@ -84,10 +84,26 @@ sub _extractDataFromDmesg {
 
     my $storages = $params{storages};
 
-    my $dmesgLines = getAllLines(
-        command => 'dmesg',
-        %params
-    );
+    my $dmesgLines;
+
+    # Check if called during unittests before checking well-known system dmesg.boot file
+    if (empty($params{file}) && has_file('/var/run/dmesg.boot')) {
+        $dmesgLines = getAllLines(
+            file    => '/var/run/dmesg.boot',
+            %params
+        );
+    }
+
+    # Fallback on dmesg output but it can be empty and so not reliable
+    if (empty($dmesgLines)) {
+        $dmesgLines = getAllLines(
+            command => 'dmesg',
+            %params
+        );
+    }
+
+    return if empty($dmesgLines);
+
     for my $storage (@$storages) {
         next unless $storage->{NAME};
         $storage->{MODEL} = getFirstMatch(

resources/bsd/storages/dmesg-freebsd-14.3

@@ -0,0 +1,13 @@
+# extract of really required lines from /var/run/dmesg.boot file
+ada0 at ahcich0 bus 0 scbus0 target 0 lun 0
+ada0: <ST1000NM0011 SN03> ATA8-ACS SATA 3.x device
+ada0: Serial Number Z1N3PC1B
+ada0: 300.000MB/s transfers (SATA 2.x, UDMA6, PIO 8192bytes)
+ada0: Command Queueing enabled
+ada0: 953869MB (1953525168 512 byte sectors)
+ada1 at ahcich1 bus 0 scbus1 target 0 lun 0
+ada1: <ST1000NM0011 SN03> ATA8-ACS SATA 3.x device
+ada1: Serial Number Z1N3PN8K
+ada1: 300.000MB/s transfers (SATA 2.x, UDMA6, PIO 8192bytes)
+ada1: Command Queueing enabled
+ada1: 953869MB (1953525168 512 byte sectors)