Skip to content

Commit

Permalink
fix serial number computation
Browse files Browse the repository at this point in the history
  • Loading branch information
@guillomovitch
guillomovitch authored and Gonéri Le Bouder committed May 24, 2012
1 parent 2499107 commit 772146f
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 28 deletions.
5 changes: 3 additions & 2 deletions lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Storages/Adaptec.pm
View file
Expand Up @@ -31,7 +31,8 @@ sub doInventory {
name => $device->{NAME},
logger => $logger
)) {
$disk->{SERIALNUMBER} = getSerialnumber($disk->{device});
$disk->{SERIALNUMBER} = getSerialnumber(device => $disk->{device});
delete $disk->{device};
$inventory->addEntry(section => 'STORAGES', entry => $disk);
}
}
Expand Down Expand Up @@ -79,7 +80,7 @@ sub _getDisksFromProc {
$disk->{MANUFACTURER} = getCanonicalManufacturer(
$disk->{MODEL}
);
$disk->{DEVICE} = "/dev/sg$count";
$disk->{device} = "/dev/sg$count";

push @disks, $disk;
}
Expand Down
8 changes: 3 additions & 5 deletions lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Storages/Lsilogic.pm
View file
Expand Up @@ -24,10 +24,8 @@ sub doInventory {
logger => $logger,
command => "mpt-status -n -i $device->{SCSI_UNID}"
)) {
$disk->{SERIALNUMBER} = getSerialnumber(
device => "/dev/sg$disk->{id}"
);
delete $disk->{id};
$disk->{SERIALNUMBER} = getSerialnumber(device => $disk->{device});
delete $disk->{device};
$inventory->addEntry(section => 'STORAGES', entry => $disk);
}
}
Expand Down Expand Up @@ -55,7 +53,7 @@ sub _getDiskFromMptStatus {
NAME => $params{name},
DESCRIPTION => 'SATA',
TYPE => 'disk',
id => $1,
device => "/dev/sg$1",
MODEL => $2,
MANUFACTURER => getCanonicalManufacturer($2),
FIRMWARE => $3,
Expand Down
26 changes: 13 additions & 13 deletions t/inventory/linux/storages/adaptec.t
View file
Expand Up @@ -18,7 +18,7 @@ my %tests = (
MODEL => 'SAMSUNG',
MANUFACTURER => 'Samsung',
FIRMWARE => 'VBM2',
DEVICE => '/dev/sg0'
device => '/dev/sg0'
}
]
},
Expand All @@ -33,7 +33,7 @@ my %tests = (
MODEL => 'HUS151436VL3800',
MANUFACTURER => 'Hitachi',
FIRMWARE => 'S3C0',
DEVICE => '/dev/sg1'
device => '/dev/sg1'
},
{
NAME => 'foo',
Expand All @@ -42,7 +42,7 @@ my %tests = (
MODEL => 'HUS151436VL3800',
MANUFACTURER => 'Hitachi',
FIRMWARE => 'S3C0',
DEVICE => '/dev/sg2'
device => '/dev/sg2'
}
]
},
Expand All @@ -57,7 +57,7 @@ my %tests = (
MODEL => 'UJDA782',
MANUFACTURER => 'UJDA782',
FIRMWARE => 'VA13',
DEVICE => '/dev/sg0'
device => '/dev/sg0'
},
]
},
Expand All @@ -72,7 +72,7 @@ my %tests = (
MODEL => 'Drive',
DESCRIPTION => 'SATA',
TYPE => 'disk',
DEVICE => '/dev/sg0'
device => '/dev/sg0'
},
{
NAME => 'foo',
Expand All @@ -81,7 +81,7 @@ my %tests = (
MODEL => 'Drive',
DESCRIPTION => 'SATA',
TYPE => 'disk',
DEVICE => '/dev/sg1'
device => '/dev/sg1'
},
{
NAME => 'foo',
Expand All @@ -90,7 +90,7 @@ my %tests = (
MODEL => 'ST3300655SS',
DESCRIPTION => 'SATA',
TYPE => 'disk',
DEVICE => '/dev/sg2'
device => '/dev/sg2'
},
{
NAME => 'foo',
Expand All @@ -99,7 +99,7 @@ my %tests = (
MODEL => 'ST3300655SS',
DESCRIPTION => 'SATA',
TYPE => 'disk',
DEVICE => '/dev/sg3'
device => '/dev/sg3'
},
{
NAME => 'foo',
Expand All @@ -108,7 +108,7 @@ my %tests = (
MODEL => 'ST3300655SS',
DESCRIPTION => 'SATA',
TYPE => 'disk',
DEVICE => '/dev/sg4'
device => '/dev/sg4'
},
{
NAME => 'foo',
Expand All @@ -117,7 +117,7 @@ my %tests = (
MODEL => 'ST3300655SS',
DESCRIPTION => 'SATA',
TYPE => 'disk',
DEVICE => '/dev/sg5'
device => '/dev/sg5'
},
{
NAME => 'foo',
Expand All @@ -126,7 +126,7 @@ my %tests = (
MODEL => 'ST3300655SS',
DESCRIPTION => 'SATA',
TYPE => 'disk',
DEVICE => '/dev/sg6'
device => '/dev/sg6'
},
{
NAME => 'foo',
Expand All @@ -135,7 +135,7 @@ my %tests = (
MODEL => 'ST3300655SS',
DESCRIPTION => 'SATA',
TYPE => 'disk',
DEVICE => '/dev/sg7'
device => '/dev/sg7'
},
{
NAME => 'foo',
Expand All @@ -144,7 +144,7 @@ my %tests = (
MODEL => 'VSC7160',
DESCRIPTION => 'SATA',
TYPE => 'disk',
DEVICE => '/dev/sg8'
device => '/dev/sg8'
}
]
}
Expand Down
16 changes: 8 additions & 8 deletions t/inventory/linux/storages/lsilogic.t
View file
Expand Up @@ -16,7 +16,7 @@ my %tests = (
MANUFACTURER => 'Seagate',
MODEL => 'ST3160815AS',
DESCRIPTION => 'SATA',
id => '1',
device => '/dev/sg1',
TYPE => 'disk'
},
{
Expand All @@ -26,7 +26,7 @@ my %tests = (
MANUFACTURER => 'Seagate',
MODEL => 'ST3160815AS',
DESCRIPTION => 'SATA',
id => '0',
device => '/dev/sg0',
TYPE => 'disk'
}
]
Expand All @@ -41,7 +41,7 @@ my %tests = (
MANUFACTURER => 'CBRCA146C3ETS0 N',
MODEL => 'CBRCA146C3ETS0 N',
DESCRIPTION => 'SATA',
id => '5',
device => '/dev/sg5',
TYPE => 'disk'
},
{
Expand All @@ -51,7 +51,7 @@ my %tests = (
MANUFACTURER => 'CBRCA146C3ETS0 N',
MODEL => 'CBRCA146C3ETS0 N',
DESCRIPTION => 'SATA',
id => '4',
device => '/dev/sg4',
TYPE => 'disk'
},
{
Expand All @@ -61,7 +61,7 @@ my %tests = (
MANUFACTURER => 'Seagate',
MODEL => 'ST9146803SS',
DESCRIPTION => 'SATA',
id => '3',
device => '/dev/sg3',
TYPE => 'disk'
},
{
Expand All @@ -71,7 +71,7 @@ my %tests = (
MANUFACTURER => 'CBRCA146C3ETS0 N',
MODEL => 'CBRCA146C3ETS0 N',
DESCRIPTION => 'SATA',
id => '2',
device => '/dev/sg2',
TYPE => 'disk'
},
{
Expand All @@ -81,7 +81,7 @@ my %tests = (
MANUFACTURER => 'CBRCA146C3ETS0 N',
MODEL => 'CBRCA146C3ETS0 N',
DESCRIPTION => 'SATA',
id => '1',
device => '/dev/sg1',
TYPE => 'disk'
},
{
Expand All @@ -91,7 +91,7 @@ my %tests = (
MANUFACTURER => 'CBRCA146C3ETS0 N',
MODEL => 'CBRCA146C3ETS0 N',
DESCRIPTION => 'SATA',
id => '0',
device => '/dev/sg0',
TYPE => 'disk'
}
]
Expand Down

0 comments on commit 772146f

Please sign in to comment.