Skip to content

Commit a9a2509

Browse files
committed
Fixes: #5049 - Account for chassis neighbors in lldp_neighbors template
1 parent e73c225 commit a9a2509

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

docs/release-notes/version-2.10.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Bug Fixes
66

7+
* [#5049](https://github.com/netbox-community/netbox/issues/5049) - Add check for LLDP neighbor chassis name to lldp_neighbors
78
* [#5301](https://github.com/netbox-community/netbox/issues/5301) - Fix misleading error when racking a device with invalid parameters
89
* [#5311](https://github.com/netbox-community/netbox/issues/5311) - Update child objects when a rack group is moved to a new site
910
* [#5518](https://github.com/netbox-community/netbox/issues/5518) - Fix persistent vertical scrollbar

netbox/templates/dcim/device/lldp_neighbors.html

+4-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<tr id="{{ iface.name }}">
2424
<td>{{ iface }}</td>
2525
{% if iface.connected_endpoint.device %}
26-
<td class="configured_device" data="{{ iface.connected_endpoint.device }}">
26+
<td class="configured_device" data="{{ iface.connected_endpoint.device }}" data-chassis="{{ iface.connected_endpoint.device.virtual_chassis.name }}">
2727
<a href="{% url 'dcim:device' pk=iface.connected_endpoint.device.pk %}">{{ iface.connected_endpoint.device }}</a>
2828
</td>
2929
<td class="configured_interface" data="{{ iface.connected_endpoint }}">
@@ -61,6 +61,7 @@
6161

6262
// Glean configured hostnames/interfaces from the DOM
6363
var configured_device = row.children('td.configured_device').attr('data');
64+
var configured_chassis = row.children('td.configured_device').attr('data-chassis');
6465
var configured_interface = row.children('td.configured_interface').attr('data');
6566
var configured_interface_short = null;
6667
if (configured_interface) {
@@ -81,9 +82,9 @@
8182
// Apply colors to rows
8283
if (!configured_device && lldp_device) {
8384
row.addClass('info');
84-
} else if (configured_device == lldp_device && configured_interface == lldp_interface) {
85+
} else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface == lldp_interface) {
8586
row.addClass('success');
86-
} else if (configured_device == lldp_device && configured_interface_short == lldp_interface) {
87+
} else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface_short == lldp_interface) {
8788
row.addClass('success');
8889
} else {
8990
row.addClass('danger');

0 commit comments

Comments
 (0)