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

network map working with pseudo devices

Browse Source
This commit is contained in:
Oliver Gorwits
2018-03-22 21:22:58 +00:00
parent b3457954a3
commit 850610f6b0
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@@ -8,6 +8,7 @@
[BUG FIXES] [BUG FIXES]
* access to manual topology for admins without port_control role * access to manual topology for admins without port_control role
* network map working with pseudo devices
2.039017 - 2018-03-20 2.039017 - 2018-03-20

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

@@ -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) INNER JOIN device_port dp2 ON (di.ip = dp2.ip AND dp.remote_port = dp2.port)
WHERE dp.remote_port IS NOT NULL WHERE dp.remote_port IS NOT NULL
AND dp.type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$'
AND dp.port !~* 'vlan' 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 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

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

@@ -14,11 +14,11 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
sum( COALESCE(dpp.raw_speed,1) ) as total sum( COALESCE(dpp.raw_speed,1) ) as total
FROM device_port FROM device_port
LEFT OUTER JOIN device_port_properties dpp USING (ip, port) LEFT OUTER JOIN device_port_properties dpp USING (ip, port)
WHERE type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$' WHERE port !~* 'vlan'
AND port !~* 'vlan' AND (type IS NULL OR type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$')
AND name !~* 'vlan' AND (name IS NULL OR name !~* 'vlan')
GROUP BY ip GROUP BY ip
ORDER BY total DESC ORDER BY total DESC, ip ASC
ENDSQL ENDSQL
); );