mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed maps display when multiple links are present between devices. (#10818)

Browse Source 
* Fix maps display only one link if multiple links are present between devices.
* Simplify test mac in network_map_items
This commit is contained in:
louis-oui
2019-11-14 20:36:01 +01:00
committed by PipoCanaja
parent 2fa91fcbe7
commit d1c73b14f3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
includes/html/print-map.inc.php
View File

@@ -286,11 +286,13 @@ foreach ($list as $items) {
$device_id1 = $items['local_device_id'].':'.$items['remote_device_id'];
$device_id2 = $items['remote_device_id'].':'.$items['local_device_id'];
// Ensure only one link exists between any two ports, or any two devices.
// If mac is choosen to graph, ensure only one link exists between any two ports, or any two devices.
// else ensure only one link exists between any two ports
if (!array_key_exists($link_id1, $link_assoc_seen) &&
!array_key_exists($link_id2, $link_assoc_seen) &&
!array_key_exists($device_id1, $device_assoc_seen) &&
!array_key_exists($device_id2, $device_assoc_seen)) {
(!in_array('mac', Config::get('network_map_items')) ||
(!array_key_exists($device_id1, $device_assoc_seen) &&
!array_key_exists($device_id2, $device_assoc_seen)))) {
$local_port = cleanPort($local_port);
$remote_port = cleanPort($remote_port);
$links[] = array_merge(