From 20250449528c25b0fdca7de0cc34ed82c507ad33 Mon Sep 17 00:00:00 2001 From: "Eric A. Miller" Date: Tue, 13 Mar 2018 22:16:43 -0400 Subject: [PATCH] #226 Avaya VSP devices - no ifAlias --- Changes | 3 ++- lib/SNMP/Info/Layer3/Passport.pm | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Changes b/Changes index d617306b..38ae8059 100644 --- a/Changes +++ b/Changes @@ -2,7 +2,8 @@ version 3.50 [BUG FIXES] - * #227 remove bogus can() check in _set() + * #226 Avaya VSP devices - no ifAlias + * #227 Remove bogus can() check in _set() * Fix SNMP::Info::IEEE802dot3ad when more than 1 LAG version 3.49 (2018-03-03) diff --git a/lib/SNMP/Info/Layer3/Passport.pm b/lib/SNMP/Info/Layer3/Passport.pm index 9aaf1edf..7bb0da92 100644 --- a/lib/SNMP/Info/Layer3/Passport.pm +++ b/lib/SNMP/Info/Layer3/Passport.pm @@ -372,6 +372,7 @@ sub i_name { my $model = $passport->model(); my $i_index = $passport->i_index($partial) || {}; my $rc_alias = $passport->rc_alias($partial) || {}; + my $i_alias = $passport->i_alias($partial) || {}; my $i_name2 = $passport->orig_i_name($partial) || {}; my $v_name = {}; my $vlan_index = {}; @@ -427,8 +428,13 @@ sub i_name { } else { - my $name = $i_name2->{$iid}; - my $alias = $rc_alias->{$iid}; + my $name = $i_name2->{$iid}; + my $pp_alias = $rc_alias->{$iid}; + my $std_alias = $i_alias->{$iid}; + my $alias + = ( defined $pp_alias and $pp_alias !~ /^\s*$/ ) + ? $pp_alias + : $std_alias; $i_name{$iid} = ( defined $alias and $alias !~ /^\s*$/ ) ? $alias