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

#215 Nokia/Alcatel-Lucent 7705 LLDP

Browse Source 
#220 Alcatel-Lucent / Nokia SR 7750 missing neighbors
Improve Layer3::Timetra model detection
Layer3::Timetra test class
This commit is contained in:
Eric A. Miller
2018-03-30 17:17:44 -04:00
parent 398f3ee74b
commit 64167df588
2 changed files with 349 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
lib/SNMP/Info/Layer3/Timetra.pm
View File

@@ -35,63 +35,149 @@ use Exporter;
use SNMP::Info::Layer3;
@SNMP::Info::Layer3::Timetra::ISA = qw/SNMP::Info::Layer3
Exporter/;
Exporter/;
@SNMP::Info::Layer3::Timetra::EXPORT_OK = qw//;
use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
$VERSION = '3.53';
%MIBS = ( %SNMP::Info::Layer3::MIBS, 'TIMETRA-GLOBAL-MIB' => 'timetraReg', );
%MIBS = (
%SNMP::Info::Layer3::MIBS,
'TIMETRA-GLOBAL-MIB' => 'timetraReg',
'TIMETRA-LLDP-MIB' => 'tmnxLldpAdminStatus',
);
%GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, );
%GLOBALS = (%SNMP::Info::Layer3::GLOBALS,);
%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
%FUNCS = (
%SNMP::Info::Layer3::FUNCS,
%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
# For some reason LLDP-MIB::lldpLocManAddrTable is populated
# but LLDP-MIB::lldpRemTable is not and we need to use the
# proprietary TIMETRA-LLDP-MIB Note: these tables are
# indexed differently than LLDP-MIB
# TIMETRA-LLDP-MIB::tmnxLldpRemTable
'lldp_rem_id_type' => 'tmnxLldpRemChassisIdSubtype',
'lldp_rem_id' => 'tmnxLldpRemChassisId',
'lldp_rem_pid_type' => 'tmnxLldpRemPortIdSubtype',
'lldp_rem_pid' => 'tmnxLldpRemPortId',
'lldp_rem_desc' => 'tmnxLldpRemPortDesc',
'lldp_rem_sysname' => 'tmnxLldpRemSysName',
'lldp_rem_sysdesc' => 'tmnxLldpRemSysDesc',
'lldp_rem_sys_cap' => 'tmnxLldpRemSysCapEnabled',
'lldp_rem_cap_spt' => 'tmnxLldpRemSysCapSupported',
# TIMETRA-LLDP-MIB::tmnxLldpRemManAddrTable
'lldp_rman_addr' => 'tmnxLldpRemManAddrIfSubtype',
);
%MUNGE = (%SNMP::Info::Layer3::MUNGE,);
sub model {
my $timetra = shift;
my $id = $timetra->id();
my $model = &SNMP::translateObj($id);
return $id unless defined $model;
my $timetra = shift;
my $id = $timetra->id();
my $model = SNMP::translateObj($id);
my $descr = $timetra->description();
if (defined $model && $model =~ /^tmnxModel/) {
$model =~ s/^tmnxModel//;
$model =~ s/Reg$//;
return $model;
}
if ($descr =~ /\s+(7\d{3})/) {
return $1;
}
return $model || $id;
}
sub os {
return 'TiMOS';
return 'TiMOS';
}
sub vendor {
return 'alcatel-lucent';
return 'nokia';
}
sub os_ver {
my $timetra = shift;
my $timetra = shift;
my $descr = $timetra->description();
if ( $descr =~ m/^TiMOS-(\S+)/ ) {
return $1;
}
# No clue what this will try but hey
return $timetra->SUPER::os_ver();
my $descr = $timetra->description();
if ($descr =~ m/^TiMOS-(\S+)/) {
return $1;
}
return;
}
# The interface description contains the SFP type, so
# to avoid losing historical information through a configuration change
# we use interface name instead.
sub interfaces {
my $alu = shift;
my $partial = shift;
my $alu = shift;
my $partial = shift;
return $alu->orig_i_name($partial);
return $alu->orig_i_name($partial);
}
# The TIMETRA-LLDP-MIB::tmnxLldpRemTable unambiguously states it uses ifIndex
# Trying to cross reference to ifDescr or ifAlias would cause unpredictable
# results based upon how the device names ports.
sub lldp_if {
my $alu = shift;
my $partial = shift;
my $addr = $alu->lldp_rem_pid($partial) || {};
my %lldp_if;
foreach my $key (keys %$addr) {
my @aOID = split('\.', $key);
my $port = $aOID[1];
next unless $port;
$lldp_if{$key} = $port;
}
return \%lldp_if;
}
# The proprietary TIMETRA-LLDP-MIB tables are indexed differently than LLDP-MIB
# We overwrite the private function so that the we don't have to replicate
# the code in SNMP::Info::LLDP that uses it.
#
# We can't use inheritance to override since it is a function, not a method
# in SNMP::Info::LLDP. This brute force redefines the code in the symbol table.
*SNMP::Info::LLDP::_lldp_addr_index = sub {
my $idx = shift;
my @oids = split(/\./, $idx);
# Index has extra field compared to LLDP-MIB
my $index = join('.', splice(@oids, 0, 4));
my $proto = shift(@oids);
shift(@oids) if scalar @oids > 4; # $length
# IPv4
if ($proto == 1) {
return ($index, $proto, join('.', @oids));
}
# IPv6
elsif ($proto == 2) {
return ($index, $proto, join(':', unpack('(H4)*', pack('C*', @oids))));
}
# MAC
elsif ($proto == 6) {
return ($index, $proto, join(':', map { sprintf "%02x", $_ } @oids));
}
# TODO - Other protocols may be used as well; implement when needed?
else {
return;
}
};
1;
__END__
@@ -137,6 +223,8 @@ Subclass for Alcatel-Lucent Service Routers
=item F<TIMETRA-GLOBAL-MIB>
=item F<TIMETRA-LLDP-MIB>
=item Inherited Classes' MIBs
See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
@@ -178,6 +266,8 @@ See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
These are methods that return tables of information in the form of a reference
to a hash.
=head2 Overrides
=over
=item $alu->interfaces()
@@ -185,6 +275,50 @@ to a hash.
Returns C<ifName>, since the default Layer3 C<ifDescr> varies based
upon the transceiver inserted.
=item $alu->lldp_if()
Returns the mapping to the SNMP Interface Table. Utilizes (C<ifIndex>)
from the (C<tmnxLldpRemEntry >) index.
=back
=head2 LLDP Remote Table (C<lldpRemTable>) uses (C<TIMETRA-LLDP-MIB::tmnxLldpRemTable>)
=over
=item $lldp->lldp_rem_id_type()
(C<tmnxLldpRemChassisIdSubtype>)
=item $lldp->lldp_rem_id()
(C<tmnxLldpRemChassisId>)
=item $lldp->lldp_rem_pid_type()
(C<tmnxLldpRemPortIdSubtype>)
=item $lldp->lldp_rem_pid()
(C<tmnxLldpRemPortId>)
=item $lldp->lldp_rem_desc()
(C<tmnxLldpRemPortDesc>)
=item $lldp->lldp_rem_sysname()
(C<tmnxLldpRemSysName>)
=item $lldp->lldp_rem_sysdesc()
(C<tmnxLldpRemSysDesc>)
=item $lldp->lldp_rem_sys_cap()
(C<tmnxLldpRemSysCapEnabled>)
=back
=head2 Table Methods imported from SNMP::Info::Layer3