openstack/monasca-api
Code Issues Proposed changes

Merge "Alarm-update failed with too few arguments"

Browse Source
This commit is contained in:
Jenkins
2016-04-19 06:11:35 +00:00
committed by Gerrit Code Review
parent 5697d16f42 69ae96014e
commit f062ec52ab
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
monasca_api/v2/reference/alarms.py
View File

@@ -184,10 +184,10 @@ class Alarms(alarms_api_v2.AlarmsV2API,
alarm_metric_rows = self._alarms_repo.get_alarm_metrics(alarm_id) alarm_metric_rows = self._alarms_repo.get_alarm_metrics(alarm_id)
sub_alarm_rows = self._alarms_repo.get_sub_alarms(tenant_id, 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, new_state,
lifecycle_state, link) lifecycle_state, link)
old_state = old_alarm['state']
# alarm_definition_id is the same for all rows. # alarm_definition_id is the same for all rows.
alarm_definition_id = sub_alarm_rows[0]['alarm_definition_id'] 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, self._send_alarm_event(u'alarm-updated', tenant_id,
alarm_definition_id, alarm_metric_rows, alarm_definition_id, alarm_metric_rows,
sub_alarm_rows, state_info) sub_alarm_rows, link, lifecycle_state, state_info)
if old_state != new_state: if old_state != new_state:
try: try:
@@ -211,6 +211,7 @@ class Alarms(alarms_api_v2.AlarmsV2API,
alarm_definition_row, alarm_definition_row,
alarm_metric_rows, alarm_metric_rows,
old_state, new_state, old_state, new_state,
link, lifecycle_state,
time_ms) time_ms)
@resource.resource_try_catch_block @resource.resource_try_catch_block

2
monasca_tempest_tests/services/monasca_client.py
View File

@@ -240,7 +240,7 @@ class MonascaClient(rest_client.RestClient):
for key, value in kwargs.iteritems(): for key, value in kwargs.iteritems():
request_body[key] = value 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) return resp, json.loads(response_body)
def patch_alarm(self, id, state=None, lifecycle_state=None, link=None, def patch_alarm(self, id, state=None, lifecycle_state=None, link=None,