From a643820a6200a7439724158a6817f3858732050c Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 2 Mar 2019 21:54:27 +0000
Subject: [PATCH] #428 Port-Channels not showing in netmap

---
 .../Netdisco/DB/Result/Virtual/DeviceLinks.pm | 20 ++++++++++---------
 .../Netdisco/Web/Plugin/Device/Neighbors.pm   | 19 +++++++-----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
index a503a3ae..9d2339ca 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
@@ -22,8 +22,8 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
              array_agg(dp.port) AS left_port,
              array_agg(dp.name) AS left_descr,
 
+             count(dpp.*) AS aggports,
              sum(COALESCE(dpp.raw_speed, 0)) AS aggspeed,
-             count(*) AS aggports,
 
              di.ip AS right_ip,
              rd.dns AS right_dns,
@@ -32,8 +32,14 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
              array_agg(dp2.name) AS right_descr
 
      FROM device_port dp
-     LEFT OUTER JOIN device_port_properties dpp USING (ip,
-                                                       port)
+
+     LEFT OUTER JOIN device_port_properties dpp ON (
+        (dp.ip = dpp.ip) AND (dp.port = dpp.port)
+        AND (dp.type IS NULL
+             OR dp.type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$')
+        AND (dp.is_master = 'false'
+             OR dp.slave_of IS NOT NULL) )
+
      INNER JOIN device ld ON dp.ip = ld.ip
      INNER JOIN device_ip di ON dp.remote_ip = di.alias
      INNER JOIN device rd ON di.ip = rd.ip
@@ -45,12 +51,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
 
      WHERE dp.remote_port IS NOT NULL
        AND dp.port !~* 'vlan'
-       AND (dp.descr IS NULL
-            OR dp.descr !~* 'vlan')
-       AND (dp.type IS NULL
-            OR dp.type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$')
-       AND (dp.is_master = 'false'
-            OR dp.slave_of IS NOT NULL)
+       AND (dp.descr IS NULL OR dp.descr !~* 'vlan')
 
      GROUP BY left_ip,
               left_dns,
@@ -58,6 +59,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
               right_ip,
               right_dns,
               right_name )
+
   SELECT *
   FROM BothWays b
   WHERE NOT EXISTS
diff --git a/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm b/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
index 5a1624be..bb63739e 100644
--- a/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
+++ b/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
@@ -125,18 +125,13 @@ sub make_link_infostring {
   (my $left_name = lc($link->{left_dns} || $link->{left_name} || $link->{left_ip})) =~ s/$domain$//;
   (my $right_name = lc($link->{right_dns} || $link->{right_name} || $link->{right_ip})) =~ s/$domain$//;
 
-  if ($link->{aggports} == 1) {
-    return sprintf '<b>%s:%s</b> (%s)<br><b>%s:%s</b> (%s)',
-      $left_name, $link->{left_port}->[0],
-      ($link->{left_descr}->[0] || 'no description'),
-      $right_name, $link->{right_port}->[0],
-      ($link->{right_descr}->[0] || 'no description');
-  }
-  else {
-    return sprintf '<b>%s:(%s)</b><br><b>%s:(%s)</b>',
-      $left_name, join(',', @{$link->{left_port}}),
-      $right_name, join(',', @{$link->{right_port}});
-  }
+  my @zipped = List::MoreUtils::zip6
+    @{$link->{left_port}}, @{$link->{left_descr}},
+    @{$link->{right_port}}, @{$link->{right_descr}};
+
+  return join '<br><br>', map { sprintf '<b>%s:%s</b> (%s)<br><b>%s:%s</b> (%s)',
+    $left_name, $_->[0], ($_->[1] || 'no description'),
+    $right_name, $_->[2], ($_->[3] || 'no description') } @zipped;
 }
 
 ajax '/ajax/data/device/netmap' => require_login sub {