From 006710f1e8105ae0bc88c4a9e1f6da7b26cf5475 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 14 May 2015 13:25:16 -0400 Subject: [PATCH] Rename 'entity' to 'component' IPMI carries a connotation of what an 'entity' is. While sticking strictly to the nomenclature of 'sensor' that actually maps would be misleading, entity is also confusing. Renaming the element to be 'component' to express what it tends to represent without getting confused with the IPMI concept of 'entity'. Change-Id: I592e1e6b9588bf381588c7d9d3e6531eb277d23c --- pyghmi/ipmi/events.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pyghmi/ipmi/events.py b/pyghmi/ipmi/events.py index b63983db..08ecb82f 100644 --- a/pyghmi/ipmi/events.py +++ b/pyghmi/ipmi/events.py @@ -376,11 +376,11 @@ class EventHandler(object): raise pygexc.PyghmiException( 'Unrecognized Event message version {0}'.format(eventdata[2])) sensor_type = eventdata[3] - event['entity_id'] = eventdata[4] + event['component_id'] = eventdata[4] try: - event['entity'] = self._sdr.sensors[eventdata[4]].name + event['component'] = self._sdr.sensors[eventdata[4]].name except KeyError: - event['entity'] = 'Sensor {0}'.format(eventdata[4]) + event['component'] = 'Sensor {0}'.format(eventdata[4]) event['deassertion'] = (eventdata[5] & 0b10000000 == 0b10000000) event_data = eventdata[6:] event_type = eventdata[5] & 0b1111111 @@ -390,19 +390,19 @@ class EventHandler(object): event['triggered_value'] = event_data[1] evtoffset = event_data[0] & 0b1111 if event_type <= 0xc: - event['entity_type_id'] = sensor_type - event['event_type_id'] = '{0}:{1}'.format(event_type, evtoffset) + event['component_type_id'] = sensor_type + event['event_id'] = '{0}.{1}'.format(event_type, evtoffset) # use generic offset decode for event description - event['entity_type'] = ipmiconst.sensor_type_codes.get( + event['component_type'] = ipmiconst.sensor_type_codes.get( sensor_type, '') evreading = ipmiconst.generic_type_offsets.get( event_type, {}).get(evtoffset, {}) event['event'] = evreading.get('desc', '') event['severity'] = evreading.get('severity', pygconst.Health.Ok) elif event_type == 0x6f: - event['entity_type_id'] = sensor_type - event['event_type_id'] = '{0}:{1}'.format(event_type, evtoffset) - event['entity_type'] = ipmiconst.sensor_type_codes.get( + event['component_type_id'] = sensor_type + event['event_id'] = '{0}.{1}'.format(event_type, evtoffset) + event['component_type'] = ipmiconst.sensor_type_codes.get( sensor_type, '') evreading = ipmiconst.sensor_type_offsets.get( sensor_type, {}).get(evtoffset, {})