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

enforce single row return

Browse Source
This commit is contained in:
Oliver Gorwits
2018-04-07 23:24:53 +01:00
parent f4a143612b
commit 87d42eacac
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -253,14 +253,14 @@ sub store_neighbors {
# attempt to resolve port name when it is given wrong # attempt to resolve port name when it is given wrong
# https://github.com/netdisco/netdisco/issues/380 # https://github.com/netdisco/netdisco/issues/380
if ($peer_device and $peer_device->in_storage) { if ($peer_device and $peer_device->in_storage) {
my $peer_port = schema('netdisco')->resultset('DevicePort')->single({ my $peer_port = schema('netdisco')->resultset('DevicePort')->search({
ip => $peer_device->ip, ip => $peer_device->ip,
port => [ port => [
{'=', $remote_port}, {'=', $remote_port},
{'-ilike', normalize_port($remote_port)}, {'-ilike', normalize_port($remote_port)},
{'-ilike', ('%'.quotemeta($remote_port))}, {'-ilike', ('%'.quotemeta($remote_port))},
], ],
}); }, { rows => 1 })->single();
if ($peer_port and ($peer_port->port ne $remote_port)) { if ($peer_port and ($peer_port->port ne $remote_port)) {
info sprintf ' [%s] neigh - changing remote port on %s from %s to %s', info sprintf ' [%s] neigh - changing remote port on %s from %s to %s',
$device->ip, $port, $remote_port, $peer_port->port; $device->ip, $port, $remote_port, $peer_port->port;