openstack
/
monasca-api
Code Issues Proposed changes

Merge "Require all fields in an alarm update request"

This commit is contained in:
Jenkins 2015-08-05 13:22:28 +00:00 committed by Gerrit Code Review
parent 0bb8867ce4 8bc6de7e89
commit 9297275bd9
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/src/main/java/monasca/api/app/command/UpdateAlarmCommand.java
View File

@ -13,7 +13,6 @@
*/ */
package monasca.api.app.command; package monasca.api.app.command;
import javax.annotation.Nullable;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import monasca.common.model.alarm.AlarmState; import monasca.common.model.alarm.AlarmState;
@ -22,12 +21,14 @@ public class UpdateAlarmCommand {
@NotNull @NotNull
public AlarmState state; public AlarmState state;
@NotNull
public String lifecycleState; public String lifecycleState;
@NotNull
public String link; public String link;
public UpdateAlarmCommand() {} public UpdateAlarmCommand() {}
public UpdateAlarmCommand(AlarmState state, @Nullable String lifecycleState, @Nullable String link) { public UpdateAlarmCommand(AlarmState state, String lifecycleState, String link) {
this.state = state; this.state = state;
this.lifecycleState = lifecycleState; this.lifecycleState = lifecycleState;
this.link = link; this.link = link;

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

@ -57,12 +57,12 @@ class Alarms(alarms_api_v2.AlarmsV2API,
if 'state' not in alarm or not alarm['state']: if 'state' not in alarm or not alarm['state']:
raise falcon.HTTPBadRequest('Bad request', raise falcon.HTTPBadRequest('Bad request',
"Field 'state' is required") "Field 'state' is required")
if 'lifecycle_state' not in alarm or not alarm['lifecycle_state']:
# Assume these fields are null if not provided raise falcon.HTTPBadRequest('Bad Request',
if 'lifecycle_state' not in alarm: "Field 'lifecycle_state' is required")
alarm['lifecycle_state'] = None if 'link' not in alarm or not alarm['link']:
if 'link' not in alarm: raise falcon.HTTPBadRequest('Bad Request',
alarm['link'] = None "Field 'link' is required")
self._alarm_update(tenant_id, alarm_id, alarm['state'], self._alarm_update(tenant_id, alarm_id, alarm['state'],
alarm['lifecycle_state'], alarm['link']) alarm['lifecycle_state'], alarm['link'])