xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-10-31 19:32:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge "Gracefully flag unrecognized discrete sensor states"

Browse Source
This commit is contained in:
Jenkins
2014-04-14 13:19:21 +00:00
committed by Gerrit Code Review
parent c9e76e4cd2 a3d4c42c5d
commit 4d0eb62c47
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pyghmi/ipmi/sdr.py
View File

@@ -368,15 +368,20 @@ class SDREntry(object):
def _decode_state(self, state):
mapping = ipmiconst.discrete_type_offsets
if self.reading_type in mapping:
desc = mapping[self.reading_type][state]['desc']
health = mapping[self.reading_type][state]['severity']
elif self.reading_type == 0x6f:
mapping = ipmiconst.sensor_type_offsets
desc = mapping[self.sensor_type_number][state]['desc']
health = mapping[self.sensor_type_number][state]['severity']
else:
desc = "Unknown state %d" % state
try:
if self.reading_type in mapping:
desc = mapping[self.reading_type][state]['desc']
health = mapping[self.reading_type][state]['severity']
elif self.reading_type == 0x6f:
mapping = ipmiconst.sensor_type_offsets
desc = mapping[self.sensor_type_number][state]['desc']
health = mapping[self.sensor_type_number][state]['severity']
else:
desc = "Unknown state %d" % state
health = const.Health.Warning
except KeyError:
desc = "Unknown state %d for reading type %d/sensor type %d" % (
state, self.reading_type, self.sensor_type_number)
health = const.Health.Warning
return (desc, health)