openstack
/
ironic
Code Issues Proposed changes

Handle LLDP parse Unicode error 

Closes-Bug: #2044793
Change-Id: I48c18d1648d446d426515456a4006947b79a9ef3
(cherry picked from commit 4d3101940a)
This commit is contained in:
Riccardo Pittau 2023-12-18 10:19:22 +01:00
parent 708ca41157
commit 6954653b48
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ironic/drivers/modules/inspector/hooks/parse_lldp.py
View File

@ -55,7 +55,16 @@ class ParseLLDPHook(base.InspectionHook):
'node': node_uuid})
continue
if parser.parse_tlv(tlv_type, data):
try:
parsed_tlv = parser.parse_tlv(tlv_type, data)
except UnicodeDecodeError as e:
LOG.warning("LLDP TLV type %(tlv_type)d from Node '%(node)s' "
"can't be decoded: %(exc)s",
{'tlv_type': tlv_type, 'exc': e,
'node': node_uuid})
continue
if parsed_tlv:
LOG.debug("Handled TLV type %d. Node: %s", tlv_type, node_uuid)
else:
LOG.debug("LLDP TLV type %d not handled. Node: %s", tlv_type,

9
releasenotes/notes/fix-lldp-decode-00021e76db26b2a5.yaml Normal file
View File

@ -0,0 +1,9 @@
---
fixes:
- |
In case the lldp raw data collected by the inspection process
includes non utf-8 information, the parser fails breaking
the inspection process.
This patch works around that excluding the malformed data
and adding an entry in the logs to provide information
on the failed tlv.