From 40abc12d87204f1fca46ae3c4ade4ed2e36bc4e5 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Sun, 16 May 2010 23:22:52 +0000 Subject: [PATCH] -Add UUID output to blade plugin -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 --- xCAT-server/lib/xcat/plugins/blade.pm | 7 +++++++ xCAT-server/lib/xcat/plugins/ipmi.pm | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm index 33e41717b..3606c8e0c 100644 --- a/xCAT-server/lib/xcat/plugins/blade.pm +++ b/xCAT-server/lib/xcat/plugins/blade.pm @@ -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}); } diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm index dfe9f354e..7efeba287 100644 --- a/xCAT-server/lib/xcat/plugins/ipmi.pm +++ b/xCAT-server/lib/xcat/plugins/ipmi.pm @@ -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);