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

smarter fix for vlan filter in netmap

Browse Source
This commit is contained in:
Oliver Gorwits
2020-01-22 21:23:57 +00:00
parent 1de0c415e1
commit bb46797201
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
View File

@@ -205,7 +205,7 @@ ajax '/ajax/data/device/netmap' => require_login sub {
my $devices = schema('netdisco')->resultset('Device')->search({}, { my $devices = schema('netdisco')->resultset('Device')->search({}, {
'+select' => [\'floor(log(throughput.total))'], '+as' => ['log'], '+select' => [\'floor(log(throughput.total))'], '+as' => ['log'],
join => 'throughput', join => 'throughput', distinct => 1,
})->with_times; })->with_times;
# filter by vlan for all or neighbors only # filter by vlan for all or neighbors only
@@ -216,10 +216,7 @@ ajax '/ajax/data/device/netmap' => require_login sub {
); );
} }
my %seen_node = ();
DEVICE: while (my $device = $devices->next) { DEVICE: while (my $device = $devices->next) {
next if $seen_node{$device->ip};
# if in neighbors mode then use %ok_dev to filter # if in neighbors mode then use %ok_dev to filter
next DEVICE if ($device->ip ne $qdev->ip) next DEVICE if ($device->ip ne $qdev->ip)
and ($mapshow eq 'neighbors') and ($mapshow eq 'neighbors')
@@ -272,8 +269,6 @@ ajax '/ajax/data/device/netmap' => require_login sub {
} }
push @{$data{'nodes'}}, $node; push @{$data{'nodes'}}, $node;
++$seen_node{$device->ip};
$metadata{'centernode'} = $device->ip $metadata{'centernode'} = $device->ip
if $qdev and $qdev->in_storage and $device->ip eq $qdev->ip; if $qdev and $qdev->in_storage and $device->ip eq $qdev->ip;
} }