From f66d73de8933a59e12a9a8b356afe907444bf6e5 Mon Sep 17 00:00:00 2001 From: Lorenzo Zafra Date: Sat, 29 Jul 2017 05:09:15 -0600 Subject: [PATCH] refactor: Use ifName if ifDescr is blank * Add if statement for ROS os when querying remote port id for LLDP map * Apply ifDescr fix in ports polling instead. --- includes/polling/ports.inc.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index 61f30be64b..1bb594a4be 100644 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -525,7 +525,13 @@ foreach ($ports as $port) { // FIXME use $q_bridge_mib[$this_port['ifIndex']] to see if it is a trunk (>1 array count) echo 'VLAN == '.$this_port['ifVlan']; - // When devices do not provide ifAlias data, populate with ifDescr data if configured + // When devices do not provide ifDescr data, populate with ifName data if available + if ($this_port['ifDescr'] == '' || $this_port['ifDescr'] == null) { + $this_port['ifDescr'] = $this_port['ifName']; + d_echo('Using ifName as ifDescr'); + } + + // When devices do not provide ifAlias data, populate with ifDescr data if configured if ($this_port['ifAlias'] == '' || $this_port['ifAlias'] == null) { $this_port['ifAlias'] = $this_port['ifDescr']; d_echo('Using ifDescr as ifAlias');