Change alarm_id to alarm_definition_id in alarm_action

Conflicts:
	monasca_notification/processors/alarm_processor.py

Change-Id: Id47a8dbb9b8327cc73b9598369e50f17b862b40c
This commit is contained in:
Deklan Dieterly 2014-10-31 15:45:59 -06:00
parent eed5a4ad16
commit 2fea98ec2b
1 changed files with 1 additions and 1 deletions

View File

@ -120,7 +120,7 @@ class AlarmProcessor(BaseProcessor):
cur.execute("""SELECT name, type, address
FROM alarm_action as aa
JOIN notification_method as nm ON aa.action_id = nm.id
WHERE aa.alarm_id = %s and aa.alarm_state = %s""",
WHERE aa.alarm_definition_id = %s and aa.alarm_state = %s""",
[alarm['alarmDefinitionId'], alarm['newState']])
except MySQLdb.Error:
log.exception('Mysql Error')