From 850610f6b076de7697d2d435ce2e9086ceb3c2e2 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Thu, 22 Mar 2018 21:22:58 +0000
Subject: [PATCH] network map working with pseudo devices

---
 Changes                                               | 1 +
 lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm     | 4 ++--
 lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Changes b/Changes
index 4aa80c41..a8d79ea3 100644
--- a/Changes
+++ b/Changes
@@ -8,6 +8,7 @@
   [BUG FIXES]
 
   * access to manual topology for admins without port_control role
+  * network map working with pseudo devices
 
 2.039017 - 2018-03-20
 
diff --git a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
index 8bc7865b..ed7299af 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
@@ -30,9 +30,9 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
  INNER JOIN device_port dp2 ON (di.ip = dp2.ip AND dp.remote_port = dp2.port)
 
  WHERE dp.remote_port IS NOT NULL
-   AND dp.type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$'
    AND dp.port !~* 'vlan'
-   AND dp.name !~* 'vlan'
+   AND (dp.type IS NULL OR dp.type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$')
+   AND (dp.name IS NULL OR dp.name !~* 'vlan')
    AND dp.ip <= dp2.ip
  GROUP BY left_ip, left_dns, left_name, right_ip, right_dns, right_name
  ORDER BY dp.ip
diff --git a/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm b/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
index aa2ac93d..0d843e2c 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
@@ -14,11 +14,11 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
          sum( COALESCE(dpp.raw_speed,1) ) as total
   FROM device_port
   LEFT OUTER JOIN device_port_properties dpp USING (ip, port)
-  WHERE type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$'
-    AND port !~* 'vlan'
-    AND name !~* 'vlan'
+  WHERE port !~* 'vlan'
+    AND (type IS NULL OR type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$')
+    AND (name IS NULL OR name !~* 'vlan')
   GROUP BY ip
-  ORDER BY total DESC
+  ORDER BY total DESC, ip ASC
 ENDSQL
 );