NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixes #1621: Tweaked LLDP interface name evaluation logic

Browse Source
This commit is contained in:
Jeremy Stretch 2018-01-05 15:19:27 -05:00
parent 95257114df
commit bb653e733c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/templates/dcim/device_lldp_neighbors.html
View File

@ -58,9 +58,10 @@ $(document).ready(function() {
// Glean configured hostnames/interfaces from the DOM // Glean configured hostnames/interfaces from the DOM
var configured_device = row.children('td.configured_device').attr('data'); var configured_device = row.children('td.configured_device').attr('data');
var configured_interface = row.children('td.configured_interface').attr('data'); var configured_interface = row.children('td.configured_interface').attr('data');
var configured_interface_short = null;
if (configured_interface) { if (configured_interface) {
// Match long-form IOS names against short ones (e.g. Gi0/1 == GigabitEthernet0/1). // Match long-form IOS names against short ones (e.g. Gi0/1 == GigabitEthernet0/1).
configured_interface = configured_interface.replace(/^([A-Z][a-z])[^0-9]*([0-9\/]+)$/, "$1$2"); configured_interface_short = configured_interface.replace(/^([A-Z][a-z])[^0-9]*([0-9\/]+)$/, "$1$2");
} }
// Clean up hostnames/interfaces learned via LLDP // Clean up hostnames/interfaces learned via LLDP
@ -76,6 +77,8 @@ $(document).ready(function() {
row.addClass('info'); row.addClass('info');
} else if (configured_device == lldp_device && configured_interface == lldp_interface) { } else if (configured_device == lldp_device && configured_interface == lldp_interface) {
row.addClass('success'); row.addClass('success');
} else if (configured_device == lldp_device && configured_interface_short == lldp_interface) {
row.addClass('success');
} else { } else {
row.addClass('danger'); row.addClass('danger');
} }