openstack/monasca-persister
Code Issues Proposed changes

Merge "Fix message parsing when link or lifecycle state is None"

Browse Source
This commit is contained in:
Jenkins 2016-02-10 21:34:09 +00:00 committed by Gerrit Code Review
commit 91b315354f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
monasca_persister/persister.py
View File

@ -633,10 +633,18 @@ def parse_alarm_state_hist_message(message):
old_state = alarm_transitioned['oldState'] old_state = alarm_transitioned['oldState']
LOG.debug('old state: %s', old_state) LOG.debug('old state: %s', old_state)
link = alarm_transitioned['link'] if 'link' in alarm_transitioned else "" # Key may not exist or value may be none, convert both to ""
if 'link' in alarm_transitioned and alarm_transitioned['link'] is not None:
link = alarm_transitioned['link']
else:
link = ""
LOG.debug('link: %s', link) LOG.debug('link: %s', link)
lifecycle_state = alarm_transitioned['lifecycleState'] if 'lifecycleState' in alarm_transitioned else "" # Key may not exist or value may be none, convert both to ""
if 'lifecycleState' in alarm_transitioned and alarm_transitioned['lifecycleState'] is not None:
lifecycle_state = alarm_transitioned['lifecycleState']
else:
lifecycle_state = ""
LOG.debug('lifecycle_state: %s', lifecycle_state) LOG.debug('lifecycle_state: %s', lifecycle_state)
state_change_reason = alarm_transitioned[ state_change_reason = alarm_transitioned[