openstack
/
senlin
Code Issues Proposed changes

Fix event generation 

This patch is about a serious bug in event generation. When passing in
an action object, we have been mistakenly using the action.id as the
obj_id. This is leading to the event generated cannot be filtered using
obj_id.

We don't have unit tests for the event module yet. That will be left in
a separate patch.

Change-Id: I542b55871845956c489b1832802bdc80deac210b
Closes-Bug: 1564936
(cherry picked from commit c153bc4e53)
This commit is contained in:
tengqm 2016-04-06 01:08:00 -04:00 committed by Qiming Teng
parent 066747b0aa
commit 4da96392ae
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
senlin/engine/event.py
View File

@ -62,7 +62,6 @@ class Event(object):
self._infer_entity_data(entity)
def _infer_entity_data(self, entity):
self.obj_id = entity.id
self.obj_name = entity.name
if self.status is None:
self.status = entity.status
@ -72,9 +71,17 @@ class Event(object):
e_type = e_type.upper()
self.obj_type = e_type
if e_type == 'CLUSTER':
self.obj_id = entity.id
self.cluster_id = entity.id
elif e_type == 'NODE':
self.obj_id = entity.id
self.cluster_id = entity.cluster_id
elif e_type == 'CLUSTERACTION':
self.obj_id = entity.target
self.cluster_id = entity.target
elif e_type == 'NODEACTION':
self.obj_id = entity.target
self.cluster_id = entity.node.cluster_id
def store(self, context):
'''Store the event into database and return its ID.'''