diff --git a/monasca_api/v2/reference/alarms.py b/monasca_api/v2/reference/alarms.py index 8a865f50e..763dcf346 100644 --- a/monasca_api/v2/reference/alarms.py +++ b/monasca_api/v2/reference/alarms.py @@ -184,10 +184,10 @@ class Alarms(alarms_api_v2.AlarmsV2API, alarm_metric_rows = self._alarms_repo.get_alarm_metrics(alarm_id) sub_alarm_rows = self._alarms_repo.get_sub_alarms(tenant_id, alarm_id) - old_state, time_ms = self._alarms_repo.update_alarm(tenant_id, alarm_id, + old_alarm, time_ms = self._alarms_repo.update_alarm(tenant_id, alarm_id, new_state, lifecycle_state, link) - + old_state = old_alarm['state'] # alarm_definition_id is the same for all rows. alarm_definition_id = sub_alarm_rows[0]['alarm_definition_id'] @@ -195,7 +195,7 @@ class Alarms(alarms_api_v2.AlarmsV2API, self._send_alarm_event(u'alarm-updated', tenant_id, alarm_definition_id, alarm_metric_rows, - sub_alarm_rows, state_info) + sub_alarm_rows, link, lifecycle_state, state_info) if old_state != new_state: try: @@ -211,6 +211,7 @@ class Alarms(alarms_api_v2.AlarmsV2API, alarm_definition_row, alarm_metric_rows, old_state, new_state, + link, lifecycle_state, time_ms) @resource.resource_try_catch_block diff --git a/monasca_tempest_tests/services/monasca_client.py b/monasca_tempest_tests/services/monasca_client.py index 6a01dccbf..b7e3d98d2 100644 --- a/monasca_tempest_tests/services/monasca_client.py +++ b/monasca_tempest_tests/services/monasca_client.py @@ -240,7 +240,7 @@ class MonascaClient(rest_client.RestClient): for key, value in kwargs.iteritems(): request_body[key] = value - resp, response_body = self.patch(uri, json.dumps(request_body)) + resp, response_body = self.put(uri, json.dumps(request_body)) return resp, json.loads(response_body) def patch_alarm(self, id, state=None, lifecycle_state=None, link=None,