xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-01-28 20:07:42 +00:00
Code Issues Projects Releases Wiki Activity

Tolerate errors in 'extra' fields

Browse Source 
Some FRU has malformed data in the extra fields.
Tolerate this by giving up when out of data to
feed the parser, and returning what was parsed
to that point.

Change-Id: I9404c579e9020dd1afe668138eefba8266f1437b
This commit is contained in:
Jarrod Johnson 2015-04-27 10:44:35 -04:00
parent e5bfd786cb
commit 35c3a326a8
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pyghmi/ipmi/fru.py
View File

@ -246,9 +246,17 @@ class FRU(object):
inf['Chassis part number'], offset = self._decode_tlv(offset + 3)
inf['Chassis serial number'], offset = self._decode_tlv(offset)
inf['chassis_extra'] = []
while self.databytes[offset] != 0xc1:
fielddata, offset = self._decode_tlv(offset)
inf['chassis_extra'].append(fielddata)
self.extract_extra(inf['chassis_extra'], offset)
def extract_extra(self, target, offset, language=0):
try:
while self.databytes[offset] != 0xc1:
fielddata, offset = self._decode_tlv(offset, language)
target.append(fielddata)
except IndexError:
# If we overrun the end due to malformed FRU,
# return at least what decoded right
return
def _parse_board(self):
offset = 8 * self.databytes[3]
@ -266,9 +274,7 @@ class FRU(object):
inf['Board model'], offset = self._decode_tlv(offset, language)
_, offset = self._decode_tlv(offset, language) # decode but discard
inf['board_extra'] = []
while self.databytes[offset] != 0xc1:
fielddata, offset = self._decode_tlv(offset, language)
inf['board_extra'].append(fielddata)
self.extract_extra(inf['board_extra'], offset, language)
def _parse_prod(self):
offset = 8 * self.databytes[4]
@ -285,9 +291,7 @@ class FRU(object):
inf['Asset Number'], offset = self._decode_tlv(offset, language)
_, offset = self._decode_tlv(offset, language)
inf['product_extra'] = []
while self.databytes[offset] != 0xc1:
fielddata, offset = self._decode_tlv(offset, language)
inf['product_extra'].append(fielddata)
self.extract_extra(inf['product_extra'], offset, language)
def __repr__(self):
return repr(self.info)