#589 only show link with highest agg speed if map links between two d…

…evices are asymmetric
netdisco · May 27, 2019 · 8878853 · 8878853
1 parent 087ca8e
commit 8878853
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
@@ -19,17 +19,17 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
     ( SELECT dp.ip AS left_ip,
              ld.dns AS left_dns,
              ld.name AS left_name,
-             array_agg(dp.port) AS left_port,
-             array_agg(dp.name) AS left_descr,
+             array_agg(dp.port ORDER BY dp.port) AS left_port,
+             array_agg(dp.name ORDER BY dp.name) AS left_descr,
 
              count(dpp.*) AS aggports,
              sum(COALESCE(dpp.raw_speed, 0)) AS aggspeed,
 
              di.ip AS right_ip,
              rd.dns AS right_dns,
              rd.name AS right_name,
-             array_agg(dp.remote_port) AS right_port,
-             array_agg(dp2.name) AS right_descr
+             array_agg(dp.remote_port ORDER BY dp.remote_port) AS right_port,
+             array_agg(dp2.name ORDER BY dp2.name) AS right_descr
 
      FROM device_port dp
 
@@ -68,8 +68,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
        WHERE b2.right_ip = b.left_ip
          AND b2.right_port = b.left_port
          AND b2.left_ip < b.left_ip )
-  ORDER BY 1,
-           2
+  ORDER BY aggspeed DESC, 1, 2
 ENDSQL
 );
 

diff --git a/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm b/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
@@ -167,6 +167,7 @@ ajax '/ajax/data/device/netmap' => require_login sub {
 
     # LINKS
 
+    my %seen_link = ();
     my $links = schema('netdisco')->resultset('Virtual::DeviceLinks')->search({
       ($mapshow eq 'neighbors' ? ( -or => [
           { left_ip  => $qdev->ip },
@@ -175,6 +176,11 @@ ajax '/ajax/data/device/netmap' => require_login sub {
     }, { result_class => 'DBIx::Class::ResultClass::HashRefInflator' });
 
     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'}}, {
         FROMID => $link->{left_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->{right_ip}};
+      ++$seen_link{$link->{left_ip} ."\0". $link->{right_ip}};
     }
 
     # DEVICES (NODES)