Mellanox port matching/link discovery missmatch

I’m trying to work my way through an issue where librenms isn’t properly displaying links between devices.

This is the LLDP as known by the device:

mx-sn2410-wms-b38-a [my-vip: master] > show lldp remote
--------------------------------------------------------------------------------
Local Interface      Device ID            Port ID              System Name
--------------------------------------------------------------------------------
Eth1/1               38:ea:a7:1e:88:00    93                   HP-5406-WMS-B36-A
Eth1/5               00:04:96:7e:0c:07    1                    EX-X670-R19-A
Eth1/7               00:04:96:51:97:e1    1                    EX-X650-R19-A
Eth1/9               02:04:96:51:81:17    1:1                  EX-X650-FB12-E
Eth1/17              40:a8:f0:09:ec:00    49                   HP-2920-WMS-B36-C
Eth1/19              40:a8:f0:1b:b0:40    49                   HP-2920-WMS-B36-B
Eth1/53              e4:1d:2d:39:13:c0    Eth1/55              mx-sx1400-r38-a
Eth1/55              7c:fe:90:f2:94:c0    Eth1/55              mx-sn2410-wms-b38-b
Eth1/56              7c:fe:90:f2:94:c0    Eth1/56              mx-sn2410-wms-b38-b

But the website shows only 2 links (with wrong ports):

Local Port     | Remote Port | Remote Device                           | Protocol
--             | --          | --                                      | --
eth1/33        | A1          | hp-2920-wms-b36-cJ9728A 2920-48G Switch | LLDP
eth1/41        | A1          | hp-2920-wms-b36-bJ9728A 2920-48G Switch | LLDP

I don’t know if this is related to the use of aggregated links (mlag), or just some sort of port transposing.

Discovery ports & lldp: https://gist.github.com/khobbits/1ae86996623e127759d887794b9d6db6
Snmpwalk: https://gist.github.com/khobbits/fdf1a491d28782f804a8904eb4c4c527
Full Poller: https://p.libren.ms/view/496b9e74
Full Discovery: https://p.libren.ms/view/e8bab46a

====================================
Component | Version
--------- | -------
LibreNMS  | 1.31.03-41-g0e6267f
DB Schema | 206
PHP       | 5.3.3
MySQL     | 5.1.73-log
RRDTool   | 1.4.7
SNMP      | NET-SNMP 5.5
====================================

Any help tracking this down is appreciated.

Can you test https://github.com/librenms/librenms/pull/7443

Does now work.