From 404fe5e9320f2fa8da9e146be95d69e6874eb20c Mon Sep 17 00:00:00 2001 From: bandorf Date: Wed, 14 Feb 2018 10:59:27 +0100 Subject: [PATCH] Fix:No alarms created if metric name in alarm def. expr. is mix case Change-Id: I38cb00fe7b10bbe6732022e8fffcecd7e5eab6b5 Story: 2001539 Task: 6349 Depends-On: I739612e96a2975bde12aea91f3f8dfcd6fb15342 --- .../common/repositories/sqla/alarm_definitions_repository.py | 3 +-- monasca_api/v2/reference/alarm_definitions.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/monasca_api/common/repositories/sqla/alarm_definitions_repository.py b/monasca_api/common/repositories/sqla/alarm_definitions_repository.py index 1dc528c30..eb53b5d89 100644 --- a/monasca_api/common/repositories/sqla/alarm_definitions_repository.py +++ b/monasca_api/common/repositories/sqla/alarm_definitions_repository.py @@ -417,8 +417,7 @@ class AlarmDefinitionsRepository(sql_repository.SQLRepository, for sub_expr in sub_expr_list: sub_alarm_definition_id = uuidutils.generate_uuid() sub_expr.id = sub_alarm_definition_id - - metric_name = sub_expr.normalized_metric_name.encode("utf8") + metric_name = sub_expr.metric_name.encode("utf8") operator = sub_expr.normalized_operator.encode('utf8') conn.execute(self.create_alarm_definition_insert_sad_query, b_id=sub_alarm_definition_id, diff --git a/monasca_api/v2/reference/alarm_definitions.py b/monasca_api/v2/reference/alarm_definitions.py index 99cdae80e..3a8418c98 100644 --- a/monasca_api/v2/reference/alarm_definitions.py +++ b/monasca_api/v2/reference/alarm_definitions.py @@ -585,7 +585,7 @@ class AlarmDefinitions(alarm_definitions_api_v2.AlarmDefinitionsV2API, for sub_expr in sub_expr_list: sub_expr_event_msg[sub_expr.id] = { u'function': sub_expr.normalized_func} - metric_definition = {u'name': sub_expr.normalized_metric_name} + metric_definition = {u'name': sub_expr.metric_name} sub_expr_event_msg[sub_expr.id][ u'metricDefinition'] = metric_definition dimensions = {}