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

Fix Avaya detection in lldp_port()

Browse Source
This commit is contained in:
Eric A. Miller
2014-07-08 21:33:18 -04:00
parent b197e9739b
commit cd54b07e09
2 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,5 +1,11 @@
SNMP::Info - Friendly OO-style interface to Network devices using SNMP. SNMP::Info - Friendly OO-style interface to Network devices using SNMP.
version 3.19
[BUG FIXES]
* Fix Avaya detection lldp_port()
version 3.18 (2014-07-02) version 3.18 (2014-07-02)
[ENHANCEMENTS] [ENHANCEMENTS]

39
Info/LLDP.pm
View File

@@ -123,7 +123,8 @@ sub lldp_if {
# If cross reference is successful use it, otherwise stick with lldpRemLocalPortNum # If cross reference is successful use it, otherwise stick with lldpRemLocalPortNum
if ( $desc && exists $r_i_descr{$desc} ) { if ( $desc && exists $r_i_descr{$desc} ) {
$port = $r_i_descr{$desc}; $port = $r_i_descr{$desc};
} elsif ( $desc && exists $r_i_alias{$desc} ) { }
elsif ( $desc && exists $r_i_alias{$desc} ) {
$port = $r_i_alias{$desc}; $port = $r_i_alias{$desc};
} }
@@ -170,13 +171,14 @@ sub lldp_port {
my $pdesc = $lldp->lldp_rem_desc($partial) || {}; my $pdesc = $lldp->lldp_rem_desc($partial) || {};
my $pid = $lldp->lldp_rem_pid($partial) || {}; my $pid = $lldp->lldp_rem_pid($partial) || {};
my $ptype = $lldp->lldp_rem_pid_type($partial) || {}; my $ptype = $lldp->lldp_rem_pid_type($partial) || {};
my $vendor = $lldp->vendor(); my $desc = $lldp->lldp_rem_sysdesc($partial) || {};
my %lldp_port; my %lldp_port;
foreach my $key ( sort keys %$pid ) { foreach my $key ( sort keys %$pid ) {
my $port = $pdesc->{$key}; my $port = $pdesc->{$key};
my $type = $ptype->{$key}; my $type = $ptype->{$key};
if ( $type and $type eq 'interfaceName' ) { if ( $type and $type eq 'interfaceName' ) {
# If the pid claims to be an interface name, # If the pid claims to be an interface name,
# believe it. # believe it.
$port = $pid->{$key}; $port = $pid->{$key};
@@ -195,8 +197,12 @@ sub lldp_port {
# Avaya/Nortel lldpRemPortDesc doesn't match ifDescr, but we can still # Avaya/Nortel lldpRemPortDesc doesn't match ifDescr, but we can still
# figure out slot.port based upon lldpRemPortDesc # figure out slot.port based upon lldpRemPortDesc
if ( $vendor eq 'avaya' && $port =~ /^(Unit\s+(\d+)\s+)?Port\s+(\d+)$/ ) { if ( defined $desc->{$key}
$port = defined $1 ? "$2.$3" : "$3"; && $desc->{$key}
=~ /^Ethernet\s(?:Routing\s)?Switch\s\d|^Virtual\sServices\sPlatform\s\d/
&& $port =~ /^(Unit\s+(\d+)\s+)?Port\s+(\d+)$/ )
{
$port = defined $1 ? "$2.$3" : "1.$3";
} }
$lldp_port{$key} = $port; $lldp_port{$key} = $port;
@@ -222,10 +228,13 @@ sub lldp_id {
if ( $type =~ /mac/ ) { if ( $type =~ /mac/ ) {
$id = join( ':', map { sprintf "%02x", $_ } unpack( 'C*', $id ) ); $id = join( ':', map { sprintf "%02x", $_ } unpack( 'C*', $id ) );
} }
elsif ($type eq 'networkAddress') { elsif ( $type eq 'networkAddress' ) {
if ( length(unpack('H*', $id)) == 10 ) { if ( length( unpack( 'H*', $id ) ) == 10 ) {
# IP address (first octet is sign, I guess) # IP address (first octet is sign, I guess)
my @octets = (map { sprintf "%02x",$_ } unpack('C*', $id))[1..4]; my @octets
= ( map { sprintf "%02x", $_ } unpack( 'C*', $id ) )
[ 1 .. 4 ];
$id = join '.', map { hex($_) } @octets; $id = join '.', map { hex($_) } @octets;
} }
} }
@@ -243,7 +252,7 @@ sub lldp_platform {
my $name = $lldp->lldp_rem_sysname($partial) || {}; my $name = $lldp->lldp_rem_sysname($partial) || {};
my %lldp_platform; my %lldp_platform;
foreach my $key (keys %$rid) { foreach my $key ( keys %$rid ) {
$lldp_platform{$key} = $desc->{$key} || $name->{$key}; $lldp_platform{$key} = $desc->{$key} || $name->{$key};
} }
return \%lldp_platform; return \%lldp_platform;
@@ -258,8 +267,12 @@ sub lldp_cap {
# Encoded as BITS which Perl Net-SNMP implementation doesn't seem to # Encoded as BITS which Perl Net-SNMP implementation doesn't seem to
# be able to enumerate for us, so we have to get it from the MIB # be able to enumerate for us, so we have to get it from the MIB
# and enumerate ourselves # and enumerate ourselves
my $oid = SNMP::translateObj('lldpRemSysCapEnabled',0,1) || ''; my $oid = SNMP::translateObj( 'lldpRemSysCapEnabled', 0, 1 ) || '';
my $enums = ((ref {} eq ref $SNMP::MIB{$oid}{'enums'}) ? $SNMP::MIB{$oid}{'enums'} : {}); my $enums = (
( ref {} eq ref $SNMP::MIB{$oid}{'enums'} )
? $SNMP::MIB{$oid}{'enums'}
: {}
);
my %r_enums = reverse %$enums; my %r_enums = reverse %$enums;
my %lldp_cap; my %lldp_cap;
@@ -268,9 +281,9 @@ sub lldp_cap {
next unless $cap_bits; next unless $cap_bits;
my $count = 0; my $count = 0;
foreach my $bit (split //,$cap_bits) { foreach my $bit ( split //, $cap_bits ) {
if ( $bit ) { if ($bit) {
push ( @{$lldp_cap{$key}}, $r_enums{$count}); push( @{ $lldp_cap{$key} }, $r_enums{$count} );
} }
$count++; $count++;
} }