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

-Reformat temperatures coming from a BladeCenter to conform to the look of the IPMI plugin

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2616 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2009-01-15 20:52:15 +00:00
parent 2aa7ab36dc
commit 6e1fdd0c2b
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -668,6 +668,20 @@ sub bootseq {
}
}
sub cleantemp {
#Taken a bladecenter string, reformat/convert to be consistent with ipmi presentation choices
my $temp = shift;
my $tnum;
$temp =~ /(\d+\.\d+) Centigrade/;
$tnum=$1;
$temp =~ s/ = /:/;
$temp =~ s/\+(\d+)/$1/; #remove + sign from temperature readings if put in
$temp =~ s/Centigrade/C/; #remove controversial use of Centigrade
if ($tnum) {
$temp .= " (".sprintf("%.2f",$tnum*(9/5)+32)." F)";
}
return $temp;
}
my %chassiswidevitals;
sub vitals {
@ -750,7 +764,7 @@ sub vitals {
$session->get($bindobj); #[".1.3.6.1.4.1.2.3.51.2.22.1.5.5.1.$idx.$slot"]);
for my $tmp (@$bindobj) {
if ($tmp and defined $tmp->[2] and $tmp->[2] !~ /Not Readable/ and $tmp->[2] ne "") {
$tmp =~ s/ = /:/;
$tmp->[2] =~ s/ = /:/;
push @output,$tmp->[2];
}
}
@ -766,10 +780,10 @@ sub vitals {
}
$bindobj= new SNMP::VarList(@bindlist);
$session->get($bindobj);
my $tnum;
for my $tmp (@$bindobj) {
if ($tmp and defined $tmp->[2] and $tmp->[2] !~ /Not Readable/ and $tmp->[2] ne "") {
$tmp =~ s/ = /:/;
push @output,$tmp->[2];
push @output,cleantemp($tmp->[2]);
}
}
unless (defined $chassiswidevitals{ambient}) {
@ -780,10 +794,11 @@ sub vitals {
$session->get($targ);
for my $result (@$targ) {
if ($result->[2] eq "NOSUCHINSTANCE") { next; }
push @{$chassiswidevitals{ambient}},"Ambient ".$tempidx++." :".$result->[2];
push @{$chassiswidevitals{ambient}},"Ambient ".$tempidx++." :".cleantemp($result->[2]);
}
}
foreach (@{$chassiswidevitals{ambient}}) {
push @output,$_;
}
}