This commit is contained in:
Bill Fenner
2008-08-01 08:10:47 +00:00
parent 347e1f9f59
commit cfd5c5d9d7
2 changed files with 103 additions and 109 deletions

View File

@@ -52,6 +52,7 @@ $VERSION = '1.09';
'ALCATEL-IND1-CHASSIS-MIB' => 'chasEntPhysOperStatus', 'ALCATEL-IND1-CHASSIS-MIB' => 'chasEntPhysOperStatus',
'ALU-POWER-ETHERNET-MIB' => 'pethPsePortDetectionStatus', 'ALU-POWER-ETHERNET-MIB' => 'pethPsePortDetectionStatus',
); );
# Alcatel provides their own version of the POWER-ETHERNET-MIB, # Alcatel provides their own version of the POWER-ETHERNET-MIB,
# off in vendor-space, without renaming any of the objects. # off in vendor-space, without renaming any of the objects.
# This means we have to *not* load the POWER-ETHERNET-MIB # This means we have to *not* load the POWER-ETHERNET-MIB
@@ -62,26 +63,25 @@ $VERSION = '1.09';
delete $MIBS{'POWER-ETHERNET-MIB'}; delete $MIBS{'POWER-ETHERNET-MIB'};
%GLOBALS = ( %GLOBALS = (
%SNMP::Info::Layer3::GLOBALS, %SNMP::Info::Layer3::GLOBALS, %SNMP::Info::MAU::GLOBALS,
%SNMP::Info::MAU::GLOBALS,
%SNMP::Info::LLDP::GLOBALS, %SNMP::Info::LLDP::GLOBALS,
); );
%FUNCS = ( %FUNCS = (
%SNMP::Info::Layer3::FUNCS, %SNMP::Info::Layer3::FUNCS, %SNMP::Info::MAU::FUNCS,
%SNMP::Info::MAU::FUNCS,
%SNMP::Info::LLDP::FUNCS, %SNMP::Info::LLDP::FUNCS,
); );
%MUNGE = ( %MUNGE = (
%SNMP::Info::Layer3::MUNGE, %SNMP::Info::Layer3::MUNGE, %SNMP::Info::MAU::MUNGE,
%SNMP::Info::MAU::MUNGE,
%SNMP::Info::LLDP::MUNGE, %SNMP::Info::LLDP::MUNGE,
); );
# use MAU-MIB for admin. duplex and admin. speed # use MAU-MIB for admin. duplex and admin. speed
*SNMP::Info::Layer3::AlcatelLucent::i_duplex_admin = \&SNMP::Info::MAU::mau_i_duplex_admin; *SNMP::Info::Layer3::AlcatelLucent::i_duplex_admin
*SNMP::Info::Layer3::AlcatelLucent::i_speed_admin = \&SNMP::Info::MAU::mau_i_speed_admin; = \&SNMP::Info::MAU::mau_i_duplex_admin;
*SNMP::Info::Layer3::AlcatelLucent::i_speed_admin
= \&SNMP::Info::MAU::mau_i_speed_admin;
sub model { sub model {
my $alu = shift; my $alu = shift;
@@ -211,6 +211,7 @@ sub bp_index {
my $partial = shift; my $partial = shift;
my $bp_index = $alu->SUPER::bp_index($partial); my $bp_index = $alu->SUPER::bp_index($partial);
# #
# This device sometimes reports an ifIndex and sometimes reports # This device sometimes reports an ifIndex and sometimes reports
# dot1dBasePort for the dot1d port values - e.g., # dot1dBasePort for the dot1d port values - e.g.,
@@ -226,6 +227,7 @@ sub bp_index {
my $ifIndex = $bp_index->{$idx}; my $ifIndex = $bp_index->{$idx};
$bp_index->{$ifIndex} = $ifIndex; $bp_index->{$ifIndex} = $ifIndex;
} }
# #
# In addition, aggregates aren't reported at all in bp_index. # In addition, aggregates aren't reported at all in bp_index.
# We grab them from i_index. # We grab them from i_index.
@@ -234,6 +236,7 @@ sub bp_index {
my $ifIndex = $i_index->{$idx}; my $ifIndex = $i_index->{$idx};
if ( int($ifIndex) > 40000001 ) { if ( int($ifIndex) > 40000001 ) {
$bp_index->{$ifIndex} = $ifIndex; $bp_index->{$ifIndex} = $ifIndex;
# dot1dTpFdbPort seems to use 4098, 4099, 4100 for # dot1dTpFdbPort seems to use 4098, 4099, 4100 for
# 40000001, 40000002, 40000003. I guess this is # 40000001, 40000002, 40000003. I guess this is
# 4096 + 1 + aggregate number. # 4096 + 1 + aggregate number.

View File

@@ -42,22 +42,13 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
$VERSION = '1.09'; $VERSION = '1.09';
%MIBS = ( %MIBS = ( %SNMP::Info::Layer3::MIBS, 'TIMETRA-GLOBAL-MIB' => 'timetraReg', );
%SNMP::Info::Layer3::MIBS,
'TIMETRA-GLOBAL-MIB' => 'timetraReg',
);
%GLOBALS = ( %GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, );
%SNMP::Info::Layer3::GLOBALS,
);
%FUNCS = ( %FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
%SNMP::Info::Layer3::FUNCS,
);
%MUNGE = ( %MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
%SNMP::Info::Layer3::MUNGE,
);
sub model { sub model {
my $timetra = shift; my $timetra = shift;