starlingx
/
config
Code Issues Proposed changes

Application applied failed due to wrong attribute 'id' 

Fault Class/Object only has alarm_id, not id which cause sysinv crash
like "AttributeError: 'Fault' object has no attribute 'id'"

Change-Id: I4aaefc764f5fa13842cd60ee99752e497a3fd439
Closes-bug: 1892830
Signed-off-by: Austin Sun <austin.sun@intel.com>
(cherry picked from commit 552b4e0171)
This commit is contained in:
Austin Sun 2020-08-25 23:10:43 +08:00
parent 023aca0a04
commit b8cf1c2a2e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py
View File

@ -2104,7 +2104,7 @@ class AppOperator(object):
for alarm in self._fm_api.get_faults_by_id(
fm_constants.FM_ALARM_ID_APPLICATION_REAPPLY_PENDING) or []:
if alarm.entity_instance_id == target_entity:
self._fm_api.clear_fault(alarm.id,
self._fm_api.clear_fault(alarm.alarm_id,
alarm.entity_instance_id)
def needs_reapply(self, app_name):
@ -2124,7 +2124,7 @@ class AppOperator(object):
for alarm in self._fm_api.get_faults_by_id(
fm_constants.FM_ALARM_ID_APPLICATION_REAPPLY_PENDING) or []:
if alarm.entity_instance_id == target_entity:
self._fm_api.clear_fault(alarm.id,
self._fm_api.clear_fault(alarm.alarm_id,
alarm.entity_instance_id)
return flag_exists