From 26398b70b6c082cbb4df272e85d21d6cbf697cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georg=20Sch=C3=B6nberger?= <gschoenberger@thomas-krenn.com>
Date: Fri, 19 Sep 2014 19:47:29 +0200
Subject: [PATCH] Parse physical devices

---
 check_lsi_raid | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/check_lsi_raid b/check_lsi_raid
index b1a3a57..5d3a962 100755
--- a/check_lsi_raid
+++ b/check_lsi_raid
@@ -449,8 +449,31 @@ sub getPhysDeviceStatus {
 						my %lineValues_h;
 						# The current block is the c0/e252/s0 name
 						$lineValues_h{'pd'} = $currBlock;
-						for(my $i = 0; $i < @ldmap_a; $i++){
-								$lineValues_h{$ldmap_a[$i]} = $splittedLine[$i];
+						my $j = 0;
+						for(my $i = 0; $i < @pdmap_a; $i++){
+								if($pdmap_a[$i] eq 'Size'){
+									my $size = $splittedLine[$j];
+									if($splittedLine[$j+1] eq 'GB' || $splittedLine[$j+1] eq 'TB'){
+										$size .= ''.$splittedLine[$j+1];
+										$j++;
+									}
+									$lineValues_h{$pdmap_a[$i]} = $size;
+									$j++;
+								}
+								elsif($pdmap_a[$i] eq 'Model'){
+									my $model = $splittedLine[$j];
+									# Model should be the next last element, j starts at 0
+									if(($j+2) != scalar(@splittedLine)){
+										$model .= ' '.$splittedLine[$j+1];
+										$j++;
+									}
+									$lineValues_h{$pdmap_a[$i]} = $model;
+									$j++;
+								}
+								else{
+									$lineValues_h{$pdmap_a[$i]} = $splittedLine[$j];
+									$j++;
+								}
 							}
 						push @physDevs, \%lineValues_h;
 					}
@@ -846,13 +869,13 @@ MAIN: {
 	$exitstatus = getExitState($newexitstatus, $exitstatus);
 	($newexitstatus, $statusMessage) = getLogicalDeviceStatus($storcli, \@logDevices, "all");
 	$newstatusMessage .= $statusMessage;
-	$exitstatus = getExitState($newexitstatus, $exitstatus);
-	($newexitstatus, $statusMessage) = getPhysDeviceStatus($sudo, $storcli, $controller, \@enclosures, \@physDevices, \@physicalDeviceTemperature_w, \@physicalDeviceTemperature_c, "initialization");
-	$newstatusMessage .= $statusMessage;
-	$exitstatus = getExitState($newexitstatus, $exitstatus);
-	($newexitstatus, $statusMessage) = getPhysDeviceStatus($sudo, $storcli, $controller, \@enclosures, \@physDevices, \@physicalDeviceTemperature_w, \@physicalDeviceTemperature_c, "rebuild");
-	$newstatusMessage .= $statusMessage;
-	$exitstatus = getExitState($newexitstatus, $exitstatus);
+#	$exitstatus = getExitState($newexitstatus, $exitstatus);
+#	($newexitstatus, $statusMessage) = getPhysDeviceStatus($sudo, $storcli, $controller, \@enclosures, \@physDevices, \@physicalDeviceTemperature_w, \@physicalDeviceTemperature_c, "initialization");
+#	$newstatusMessage .= $statusMessage;
+#	$exitstatus = getExitState($newexitstatus, $exitstatus);
+#	($newexitstatus, $statusMessage) = getPhysDeviceStatus($sudo, $storcli, $controller, \@enclosures, \@physDevices, \@physicalDeviceTemperature_w, \@physicalDeviceTemperature_c, "rebuild");
+#	$newstatusMessage .= $statusMessage;
+#	$exitstatus = getExitState($newexitstatus, $exitstatus);
 	($newexitstatus, $statusMessage) = getPhysDeviceStatus($sudo, $storcli, $controller, \@enclosures, \@physDevices, \@physicalDeviceTemperature_w, \@physicalDeviceTemperature_c, "all");
 	$newstatusMessage .= $statusMessage;
 	$exitstatus = getExitState($newexitstatus, $exitstatus);