diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-08-11 16:23:53 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-08-11 16:24:42 +0530 |
| commit | a7f4bdc6c9c1961b77fd4b8d6881a144e271e3b3 (patch) | |
| tree | a4e322cfa11055444c45bd008433bd77b6c64059 /src/com.gluster.storage.management.gateway | |
| parent | 9d59c906da655e6a5e225c85fd3e9a9152ad7504 (diff) | |
REST API changes
Diffstat (limited to 'src/com.gluster.storage.management.gateway')
2 files changed, 8 insertions, 2 deletions
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java index 0861e1d6..16faf7de 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java @@ -193,7 +193,13 @@ public class TasksResource extends AbstractResource { } if(taskOperation == null || taskOperation.isEmpty()) { - return badRequestResponse("Parameter [" + FORM_PARAM_OPERATION + "] is missing in request!"); + int taskStatus = task.getTaskInfo().getStatus().getCode(); + if (taskStatus == Status.STATUS_CODE_SUCCESS || taskStatus == Status.STATUS_CODE_FAILURE) { + taskOperation = RESTConstants.TASK_DELETE; + } else { + taskOperation = RESTConstants.TASK_STOP; + } +// return badRequestResponse("Parameter [" + FORM_PARAM_OPERATION + "] is missing in request!"); } if(!taskOperation.equals(RESTConstants.TASK_STOP) && !taskOperation.equals(RESTConstants.TASK_DELETE)) { diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java index 618c03af..66c73260 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java @@ -523,7 +523,7 @@ public class VolumeService { // populate disk and trim other fields List<VolumeLogMessage> logMessages = response.getLogMessages(); for (VolumeLogMessage logMessage : logMessages) { - logMessage.setBrickDirectory(brick.getBrickDirectory()); + logMessage.setBrick(brick.getQualifiedName()); } return logMessages; } |