From 97d5501ba0ea5f88b8931fd2c17a5ee59a814641 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 7 Apr 2018 23:59:59 +0100
Subject: [PATCH] do not include logical aggregate masters in netmap/speed calc

---
 lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm     | 1 +
 lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
index ed7299af..8c893816 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
@@ -33,6 +33,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
    AND dp.port !~* '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 <= 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 a67c8985..520c2b4c 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
@@ -17,6 +17,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
   WHERE port !~* 'vlan'
     AND (type IS NULL OR type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$')
     AND (name IS NULL OR name !~* 'vlan')
+    AND (is_master = 'false' OR slave_of IS NOT NULL)
   GROUP BY ip
   ORDER BY total DESC, ip ASC
 ENDSQL