From a6f2805bbc2d51918a027ca519ada793cb6c9cf9 Mon Sep 17 00:00:00 2001 From: Bob Fournier Date: Wed, 24 Jan 2018 14:35:09 -0500 Subject: [PATCH] Remove use of construct lib FieldError exception Version 2.8.22 of the construct lib has introduced a change that removed the core.FieldError exception. The check now uses the parent exception - core.ConstructError. Change-Id: I31922c2afc2018a4f6f7ba48094388070537a13f Closes-Bug: 1745208 --- ironic_inspector/common/lldp_parsers.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ironic_inspector/common/lldp_parsers.py b/ironic_inspector/common/lldp_parsers.py index b48d222f7..d2055158d 100644 --- a/ironic_inspector/common/lldp_parsers.py +++ b/ironic_inspector/common/lldp_parsers.py @@ -155,8 +155,7 @@ class LLDPParser(object): # individual fields can be accessed try: struct = tlv_parser.parse(data) - except (core.RangeError, core.FieldError, core.MappingError, - netaddr.AddrFormatError) as e: + except (core.ConstructError, netaddr.AddrFormatError) as e: LOG.warning("TLV parse error: %s", e, node_info=self.node_info) return False