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 = {}