135/snmp-info
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Capture base MAC in L3::Huawei

Browse Source 
Capture fan and power supply status in L3::Huawei when description is not available
This commit is contained in:
Eric A. Miller
2018-05-01 22:19:39 -04:00
parent 8d35e15624
commit 1c581f8e8f
3 changed files with 67 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/SNMP/Info/Layer3/Huawei.pm
View File

@@ -152,6 +152,12 @@ sub os_ver {
return $os_ver;
}
sub mac {
my $huawei = shift;
return $huawei->b_mac();
}
sub i_ignore {
my $huawei = shift;
my $partial = shift;
@@ -379,15 +385,19 @@ sub fan {
my $fan = $huawei->hw_fan_descr() || {};
my $state = $huawei->hw_fan_state() || {};
if ( scalar keys %$fan ) {
if ( scalar keys %$state ) {
my @messages = ();
foreach my $k ( keys %$fan ) {
foreach my $k ( keys %$state ) {
next if $state->{$k} and $state->{$k} eq 'normal';
push @messages, "$fan->{$k}: $state->{$k}";
my ($slot, $num) = split(/\./, $k);
my $descr = "Slot $slot,Fan $num";
$descr = $fan->{$k} if ($fan->{$k});
push @messages, "$descr: $state->{$k}";
}
push @messages, ( ( scalar keys %$fan ) . " fans OK" )
push @messages, ( ( scalar keys %$state ) . " fans OK" )
if scalar @messages == 0;
return ( join ", ", @messages );
@@ -406,7 +416,10 @@ sub ps1_status {
foreach my $i ( sort keys %$pwr_state ) {
my ( $slot, $num ) = split( /\./, $i );
next unless $num == 1;
$ret .= $s . $pwr_descr->{$i} . ": " . $pwr_state->{$i};
my $descr = "Slot $slot,PS $num";
$descr = $pwr_descr->{$i} if ($pwr_descr->{$i});
$ret .= $s . $descr . ": " . $pwr_state->{$i};
$s = ", ";
}
return if ( $s eq "" );
@@ -424,7 +437,10 @@ sub ps2_status {
foreach my $i ( sort keys %$pwr_state ) {
my ( $slot, $num ) = split( /\./, $i );
next unless $num == 2;
$ret .= $s . $pwr_descr->{$i} . ": " . $pwr_state->{$i};
my $descr = "Slot $slot,PS $num";
$descr = $pwr_descr->{$i} if ($pwr_descr->{$i});
$ret .= $s . $descr . ": " . $pwr_state->{$i};
$s = ", ";
}
return if ( $s eq "" );