135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not include logical aggregate masters in netmap/speed calc

Browse Source
This commit is contained in:
Oliver Gorwits
2018-04-07 23:59:59 +01:00
parent 927f2f0a74
commit 97d5501ba0
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
View File

@@ -33,6 +33,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
AND dp.port !~* 'vlan' AND dp.port !~* 'vlan'
AND (dp.type IS NULL OR dp.type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$') 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.name IS NULL OR dp.name !~* 'vlan')
AND (dp.is_master = 'false' OR dp.slave_of IS NOT NULL)
AND dp.ip <= dp2.ip AND dp.ip <= dp2.ip
GROUP BY left_ip, left_dns, left_name, right_ip, right_dns, right_name GROUP BY left_ip, left_dns, left_name, right_ip, right_dns, right_name
ORDER BY dp.ip ORDER BY dp.ip

1
lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
View File

@@ -17,6 +17,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
WHERE port !~* 'vlan' WHERE port !~* 'vlan'
AND (type IS NULL OR type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$') AND (type IS NULL OR type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$')
AND (name IS NULL OR name !~* 'vlan') AND (name IS NULL OR name !~* 'vlan')
AND (is_master = 'false' OR slave_of IS NOT NULL)
GROUP BY ip GROUP BY ip
ORDER BY total DESC, ip ASC ORDER BY total DESC, ip ASC
ENDSQL ENDSQL