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

#589 only show link with highest agg speed if map links between two devices are asymmetric

Browse Source
This commit is contained in:
Oliver Gorwits
2019-05-27 15:36:17 +01:00
parent 087ca8e33c
commit 88788534ba
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
View File

@@ -19,8 +19,8 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
( SELECT dp.ip AS left_ip, ( SELECT dp.ip AS left_ip,
ld.dns AS left_dns, ld.dns AS left_dns,
ld.name AS left_name, ld.name AS left_name,
array_agg(dp.port) AS left_port, array_agg(dp.port ORDER BY dp.port) AS left_port,
array_agg(dp.name) AS left_descr, array_agg(dp.name ORDER BY dp.name) AS left_descr,
count(dpp.*) AS aggports, count(dpp.*) AS aggports,
sum(COALESCE(dpp.raw_speed, 0)) AS aggspeed, sum(COALESCE(dpp.raw_speed, 0)) AS aggspeed,
@@ -28,8 +28,8 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
di.ip AS right_ip, di.ip AS right_ip,
rd.dns AS right_dns, rd.dns AS right_dns,
rd.name AS right_name, rd.name AS right_name,
array_agg(dp.remote_port) AS right_port, array_agg(dp.remote_port ORDER BY dp.remote_port) AS right_port,
array_agg(dp2.name) AS right_descr array_agg(dp2.name ORDER BY dp2.name) AS right_descr
FROM device_port dp FROM device_port dp
@@ -68,8 +68,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
WHERE b2.right_ip = b.left_ip WHERE b2.right_ip = b.left_ip
AND b2.right_port = b.left_port AND b2.right_port = b.left_port
AND b2.left_ip < b.left_ip ) AND b2.left_ip < b.left_ip )
ORDER BY 1, ORDER BY aggspeed DESC, 1, 2
2
ENDSQL ENDSQL
); );

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

@@ -167,6 +167,7 @@ ajax '/ajax/data/device/netmap' => require_login sub {
# LINKS # LINKS
my %seen_link = ();
my $links = schema('netdisco')->resultset('Virtual::DeviceLinks')->search({ my $links = schema('netdisco')->resultset('Virtual::DeviceLinks')->search({
($mapshow eq 'neighbors' ? ( -or => [ ($mapshow eq 'neighbors' ? ( -or => [
{ left_ip => $qdev->ip }, { left_ip => $qdev->ip },
@@ -175,6 +176,11 @@ ajax '/ajax/data/device/netmap' => require_login sub {
}, { result_class => 'DBIx::Class::ResultClass::HashRefInflator' }); }, { result_class => 'DBIx::Class::ResultClass::HashRefInflator' });
while (my $link = $links->next) { while (my $link = $links->next) {
# query is ordered by aggregate speed desc so we see highest speed
# first, which is hopefully the "best" if links are not symmetric
next if exists $seen_link{$link->{left_ip} ."\0". $link->{right_ip}}
or exists $seen_link{$link->{right_ip} ."\0". $link->{left_ip}};
push @{$data{'links'}}, { push @{$data{'links'}}, {
FROMID => $link->{left_ip}, FROMID => $link->{left_ip},
TOID => $link->{right_ip}, TOID => $link->{right_ip},
@@ -184,6 +190,7 @@ ajax '/ajax/data/device/netmap' => require_login sub {
++$ok_dev{$link->{left_ip}}; ++$ok_dev{$link->{left_ip}};
++$ok_dev{$link->{right_ip}}; ++$ok_dev{$link->{right_ip}};
++$seen_link{$link->{left_ip} ."\0". $link->{right_ip}};
} }
# DEVICES (NODES) # DEVICES (NODES)