135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#263 discover neighbors advertising ipv6 management addresses

Browse Source
This commit is contained in:
Oliver Gorwits
2017-06-24 19:41:57 +01:00
parent 4ad9497784
commit 39927dee68
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changes
View File

@@ -4,6 +4,7 @@
* #319 better fix for acceping ACL names or values in check_acl_* * #319 better fix for acceping ACL names or values in check_acl_*
* #311 added duplicate devices report with option to delete * #311 added duplicate devices report with option to delete
* #263 discover neighbors advertising ipv6 management addresses
[BUG FIXES] [BUG FIXES]
@@ -11,7 +12,7 @@
* #318 ACLs with RegExp are very slow - aggressive resolver timeouts * #318 ACLs with RegExp are very slow - aggressive resolver timeouts
* #317 #265 #311 when renumbering on discover, delete likely duplicate devices * #317 #265 #311 when renumbering on discover, delete likely duplicate devices
* #316 neighbor map should fall back to device sysname after dns * #316 neighbor map should fall back to device sysname after dns
* #310 multiple LLDP management addresses * #310 allow multiple LLDP management addresses
2.036001 - 2017-06-22 2.036001 - 2017-06-22

10
lib/App/Netdisco/Core/Discover.pm
View File

@@ -710,7 +710,15 @@ sub store_neighbors {
_set_manual_topology($device, $snmp); _set_manual_topology($device, $snmp);
my $c_ip = $snmp->c_ip; my $c_ip = $snmp->c_ip;
unless ($snmp->hasCDP or scalar keys %$c_ip) { my %c_ipv6 = %{ ($snmp->can('hasLLDP') and $snmp->hasLLDP)
? $snmp->lldp_ipv6 : {} };
# remove keys with undef values, as c_ip does
delete @c_ipv6{ grep { not defined $c_ipv6{$_} } keys %c_ipv6 };
# now combine them, v6 wins
$c_ip = { %$c_ip, %c_ipv6 };
unless (($snmp->can('hasCDP') and $snmp->hasCDP) or scalar keys %$c_ip) {
debug sprintf ' [%s] neigh - CDP/LLDP not enabled!', $device->ip; debug sprintf ' [%s] neigh - CDP/LLDP not enabled!', $device->ip;
return @to_discover; return @to_discover;
} }