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

make store_neighbors independent of topo protocol

Browse Source
This commit is contained in:
Oliver Gorwits
2017-06-25 08:45:14 +01:00
parent 39927dee68
commit e1d3493bf4
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -709,17 +709,8 @@ sub store_neighbors {
# first allow any manually configured topology to be set # first allow any manually configured topology to be set
_set_manual_topology($device, $snmp); _set_manual_topology($device, $snmp);
my $c_ip = $snmp->c_ip; if (!defined $snmp->has_topo) {
my %c_ipv6 = %{ ($snmp->can('hasLLDP') and $snmp->hasLLDP) debug sprintf ' [%s] neigh - neighbor protocols are not enabled', $device->ip;
? $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;
return @to_discover; return @to_discover;
} }
@@ -730,6 +721,16 @@ sub store_neighbors {
my $c_platform = $snmp->c_platform; my $c_platform = $snmp->c_platform;
my $c_cap = $snmp->c_cap; my $c_cap = $snmp->c_cap;
# v4 and v6 neighbor tables
my $c_ip = ($snmp->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 };
foreach my $entry (sort (List::MoreUtils::uniq( (keys %$c_ip), (keys %$c_cap) ))) { foreach my $entry (sort (List::MoreUtils::uniq( (keys %$c_ip), (keys %$c_cap) ))) {
if (!defined $c_if->{$entry} or !defined $interfaces->{ $c_if->{$entry} }) { if (!defined $c_if->{$entry} or !defined $interfaces->{ $c_if->{$entry} }) {
debug sprintf ' [%s] neigh - port for IID:%s not resolved, skipping', debug sprintf ' [%s] neigh - port for IID:%s not resolved, skipping',