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

#81 avoid DEPRECATED single warning from DBIC

Browse Source
This commit is contained in:
Oliver Gorwits
2019-12-22 09:07:12 +00:00
parent 17da397c56
commit f7f2d2088b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
View File

@@ -155,7 +155,7 @@ sub store_neighbors {
} }
if (ref $c_ip->{$entry}) { if (ref $c_ip->{$entry}) {
error sprintf ' [%s] neigh - Error! port %s has multiple neighbors - skipping', debug sprintf ' [%s] neigh - port %s has multiple neighbors - skipping',
$device->ip, $port; $device->ip, $port;
next; next;
} }
@@ -189,10 +189,18 @@ sub store_neighbors {
if ($remote_id) { if ($remote_id) {
my $devices = schema('netdisco')->resultset('Device'); my $devices = schema('netdisco')->resultset('Device');
my $neigh = $devices->single({name => $remote_id});
debug sprintf debug sprintf
' [%s] neigh - bad address %s on port %s, searching for %s instead', ' [%s] neigh - bad address %s on port %s, searching for %s instead',
$device->ip, $remote_ip, $port, $remote_id; $device->ip, $remote_ip, $port, $remote_id;
my $neigh_rs = $devices->search_rs({name => $remote_id});
my $neigh = ($neigh_rs->count == 1 ? $neigh_rs->first : undef);
if (!defined $neigh and $neigh_rs->count) {
debug sprintf ' [%s] neigh - multiple devices claim to be %s (port %s) - skipping',
$device->ip, $remote_id, $port;
next;
}
if (!defined $neigh) { if (!defined $neigh) {
my $mac = NetAddr::MAC->new(mac => $remote_id); my $mac = NetAddr::MAC->new(mac => $remote_id);