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

try to match remote port in netmap against port, name, and descr

Browse Source
This commit is contained in:
Oliver Gorwits
2018-04-10 21:45:12 +01:00
parent 8838f262c1
commit 642820d25b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changes
View File

@@ -1,4 +1,4 @@
2.039021 - 2018-04- 2.039021 - 2018-04-10
[BUG FIXES] [BUG FIXES]
@@ -6,6 +6,7 @@
* #390 cannot take logarithm of zero (C. Stromsoe) * #390 cannot take logarithm of zero (C. Stromsoe)
* protect against undef mac (l.e. ferguson) * protect against undef mac (l.e. ferguson)
* do not include logical aggregate masters in netmap/speed calc * do not include logical aggregate masters in netmap/speed calc
* try to match remote port in netmap against port, name, and descr
2.039020 - 2018-03-26 2.039020 - 2018-03-26

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

@@ -27,7 +27,11 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
INNER JOIN device ld ON dp.ip = ld.ip INNER JOIN device ld ON dp.ip = ld.ip
INNER JOIN device_ip di ON dp.remote_ip = di.alias INNER JOIN device_ip di ON dp.remote_ip = di.alias
INNER JOIN device rd ON di.ip = rd.ip INNER JOIN device rd ON di.ip = rd.ip
LEFT OUTER JOIN device_port dp2 ON (di.ip = dp2.ip AND dp.remote_port = dp2.port) LEFT OUTER JOIN device_port dp2
ON (di.ip = dp2.ip
AND ((dp.remote_port = dp2.port)
OR (dp.remote_port = dp2.name)
OR (dp.remote_port = dp2.descr)))
WHERE dp.remote_port IS NOT NULL WHERE dp.remote_port IS NOT NULL
AND dp.port !~* 'vlan' AND dp.port !~* 'vlan'