arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-Add UUID output to blade plugin

Browse Source 
-Make output consistent between blade/ipmi


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6143 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2010-05-16 23:22:52 +00:00
parent ecadae75bf
commit 40abc12d87
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xCAT-server/lib/xcat/plugins/blade.pm
View File

@ -73,6 +73,7 @@ my $mpresetoid = '1.3.6.1.4.1.2.3.51.2.22.1.6.1.1.9'; #restartBladeSMP
my $bladexistsoid = '1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.3'; #bladeExists
my $bladeserialoid = '1.3.6.1.4.1.2.3.51.2.2.21.4.1.1.6'; #bladeHardwareVpdSerialNumber
my $blademtmoid = '1.3.6.1.4.1.2.3.51.2.2.21.4.1.1.7'; #bladeHardwareVpdMachineType
my $bladeuuidoid = '1.3.6.1.4.1.2.3.51.2.2.21.4.1.1.8'; #bladeHardwareVpdUuid
my $bladempveroid = '1.3.6.1.4.1.2.3.51.2.2.21.5.3.1.7'; #bladeSysMgmtProcVpdRevision
my $bladempaveroid = '1.3.6.1.4.1.2.3.51.2.2.21.3.1.1.4';#mmMainApplVpdRevisonNumber
my $bladempabuildidoid = '1.3.6.1.4.1.2.3.51.2.2.21.3.1.1.3';#mmMainApplVpdBuildId
@ -1623,6 +1624,12 @@ sub inv {
if ($session->{ErrorStr}) { return (1,$session->{ErrorStr}); }
push @output,"Machine Type/Model: ".$data;
}
if ($item =~ /^uuid/ or $item =~ /^guid/) {
$data=$session->get([$bladeuuidoid,$slot]);
if ($session->{ErrorStr}) { return (1,$session->{ErrorStr}); }
$data =~ s/ /-/g;
push @output,"UUID/GUID: ".$data;
}
if ($item =~ /^serial/) {
$data=$session->get([$bladeserialoid,$slot]);
if ($session->{ErrorStr}) { return (1,$session->{ErrorStr}); }

2
xCAT-server/lib/xcat/plugins/ipmi.pm
View File

@ -4838,7 +4838,7 @@ sub gotguid {
#}
my $fru = FRU->new();
$fru->rec_type("guid");
$fru->desc("GUID");
$fru->desc("UUID/GUID");
$fru->value(sprintf("%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X",@{$rsp->{data}}));
$sessdata->{fru_hash}->{guid} = $fru;
initfru_withguid($sessdata);