From cab129a5796a8811c507b4fca1576a06b2341430 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sun, 22 Apr 2018 11:54:36 +0100
Subject: [PATCH] #380 should check descr not name for "vlan"

---
 lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
index 55ef729d..f59c315a 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
@@ -35,8 +35,8 @@ __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.name IS NULL OR dp.name !~* 'vlan')
    AND (dp.is_master = 'false' OR dp.slave_of IS NOT NULL)
    AND dp.ip <= di.ip
  GROUP BY left_ip, left_dns, left_name, right_ip, right_dns, right_name