Alerts and running task UI stories review updates

3 files changed, 53 insertions, 50 deletions

diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java
index 266bd8d3..58eb4fce 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java
@@ -29,57 +29,62 @@ public class AlertsResource {
 		// Alert #1
 		Alert alert = new Alert();
 		alert.setId("0001");
-		alert.setReference("Server1"); // Server 
+		alert.setReference("Server1"); // Server
 		alert.setType(Alert.ALERT_TYPES.CPU_USAGE_ALERT);
-		alert.setMessage(alert.getAlertType(alert.getType()) + " in server: " + alert.getReference());
+		alert.setMessage(alert.getAlertType(alert.getType()) + " in server ["
+				+ alert.getReference() + "]");
 		alerts.add(alert);
-		
+
 		// Alert #2
 		alert = new Alert();
 		alert.setId("0002");
 		alert.setReference("Server2"); // server:Disk - brick
 		alert.setType(Alert.ALERT_TYPES.MEMORY_USAGE_ALERT);
-		alert.setMessage(alert.getAlertType(alert.getType()) + " in server: " + alert.getReference());
+		alert.setMessage(alert.getAlertType(alert.getType()) + " in server ["
+				+ alert.getReference() + "]");
 		alerts.add(alert);
-		
+
 		// Alert #3
 		alert = new Alert();
 		alert.setId("0003");
-		alert.setReference("Volume1"); // Volume name 
+		alert.setReference("server1:sda1"); // Disk name
 		alert.setType(Alert.ALERT_TYPES.DISK_USAGE_ALERT);
-		alert.setMessage(alert.getAlertType(alert.getType()) + " in volume: " + alert.getReference());
+		alert.setMessage(alert.getAlertType(alert.getType()) + " in disk ["
+				+ alert.getReference() + "]");
 		alerts.add(alert);
-		
+
 		// Alert #4
 		alert = new Alert();
 		alert.setId("0004");
-		alert.setReference("Volume2"); // Volume name 
+		alert.setReference("Volume2:server2:sda1"); // volume:[Disk name]
 		alert.setType(Alert.ALERT_TYPES.OFFLINE_VOLUME_DISKS_ALERT);
-		alert.setMessage("Server1:sda1, server2:sda2 are " + alert.getAlertType(alert.getType()) + " in volume: " + alert.getReference());
+		alert.setMessage(alert.getAlertType(alert.getType()) + " in volume ["
+				+ alert.getReference().split(":")[0] + "] disk ["
+				+ alert.getReference().split(":")[1] + ":"
+				+ alert.getReference().split(":")[2] + "]");
 		alerts.add(alert);
-		
+
 		// Alert #5
 		alert = new Alert();
 		alert.setId("0005");
-		alert.setReference("Volume2"); // Volume name 
+		alert.setReference("Server2"); // Server name
 		alert.setType(Alert.ALERT_TYPES.OFFLINE_SERVERS_ALERT);
-		alert.setMessage("server1, server2 are " + alert.getAlertType(alert.getType()) + " in volume: " + alert.getReference());
+		alert.setMessage(alert.getAlertType(alert.getType()) + " ["
+				+ alert.getReference() + "]");
 		alerts.add(alert);
-		
+
 		return new AlertListResponse(alerts);
 
 	}
-	
-	public static void  main(String[] args) {
+
+	public static void main(String[] args) {
 		/*
-		// Unit test code
-		AlertsResource alertResource = new AlertsResource();
-		AlertsListResponse alertResponse = alertResource.getAlerts();
-		List<Alert> alerts = alertResponse.getAlerts();
-		for (Alert alert: alerts) {
-		    System.out.println(alert.getMessage());
-		}
-		*/
+		 * // Unit test code AlertsResource alertResource = new
+		 * AlertsResource(); AlertsListResponse alertResponse =
+		 * alertResource.getAlerts(); List<Alert> alerts =
+		 * alertResponse.getAlerts(); for (Alert alert: alerts) {
+		 * System.out.println(alert.getMessage()); }
+		 */
 	}
 
 }
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java
index 2177085e..0d48cc57 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java
@@ -49,48 +49,49 @@ public class RunningTaskResource {
 	@GET
 	@Produces(MediaType.TEXT_XML)
 	public RunningTaskListResponse getRunningTasks() {
-
-		RunningTaskStatus status = new RunningTaskStatus();
+		
+		RunningTaskStatus taskStatus = new RunningTaskStatus();
 		List<RunningTask> runningTasks = new ArrayList<RunningTask>(); 
 		
-		status.setCode(Status.STATUS_CODE_RUNNING);
-		status.setPercentageSupported(false);
+		taskStatus.setCode(Status.STATUS_CODE_RUNNING);
+		taskStatus.setPercentageSupported(false);
 
+		
 		// Volume rebalance
 		RunningTask task = new RunningTask();
 		task.setId("0001");
 		task.setType(RunningTask.TASK_TYPES.VOLUME_REBALANCE);
 		task.setReference("Volume1");
-		task.setTaskInfo( task.getTaskType(task.getType()) +  "is running in volume " + task.getReference());
-		task.setStatus(status);
+		task.setTaskInfo( task.getTaskType( task.getType() ) +  " on [" + task.getReference() + "]");
+		task.setStatus(taskStatus);
 		runningTasks.add(task);
 
 		task = new RunningTask();
 		task.setId("0002");
 		task.setType(RunningTask.TASK_TYPES.VOLUME_REBALANCE);
 		task.setReference("Volume2");
-		task.setTaskInfo( task.getTaskType(task.getType()) +  " is running in volume " + task.getReference());
-		task.setStatus(status);
+		task.setTaskInfo( task.getTaskType( task.getType() ) +  " on [" + task.getReference() + "]");
+		task.setStatus(taskStatus);
 		runningTasks.add(task);
 
 		// MigrateDisk
 		task = new RunningTask();
 		task.setId("0003");
-		task.setType(RunningTask.TASK_TYPES.MIGRATE_DISK);
+		task.setType(RunningTask.TASK_TYPES.DISK_MIGRATE);
 		task.setReference("Volume3:server1:sda1");  // Disk reference
-		task.setTaskInfo( task.getTaskType(task.getType()) +  " is running in disk " +  task.getReference() + "");
-		task.setStatus(status);
+		task.setTaskInfo( task.getTaskType( task.getType() ) +  " for volume [" +  task.getReference().split(":")[0] + "] disk [" + task.getReference().split(":")[1] + ":" + task.getReference().split(":")[2] + "]" ) ;
+		task.setStatus(taskStatus);
 		runningTasks.add(task);
 
 		// FormatDisk
 		task = new RunningTask();
 		task.setId("0004");
-		task.setType(RunningTask.TASK_TYPES.FORMAT_DISK);
-		task.setReference("Volume1:server1:sdb1");  // Disk reference
-		task.setTaskInfo( task.getTaskType(task.getType()) +  " " + task.getReference() );
-		status.setPercentageSupported(true);
-		status.getPercentCompleted(45);
-		task.setStatus(status);
+		task.setType(RunningTask.TASK_TYPES.DISK_FORMAT);
+		task.setReference("server1:sdb1");  // Disk reference
+		task.setTaskInfo( task.getTaskType( task.getType() ) +  " [" + task.getReference() + "]");
+		taskStatus.setPercentageSupported(true);
+		taskStatus.getPercentCompleted(45);
+		task.setStatus(taskStatus);
 		runningTasks.add(task);
 		
 		return new RunningTaskListResponse(Status.STATUS_SUCCESS, runningTasks);
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
index 67814126..aae740e4 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
@@ -27,8 +27,6 @@ import static com.gluster.storage.management.core.constants.RESTConstants.PATH_P
 import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_VOLUMES;
 import static com.gluster.storage.management.core.constants.RESTConstants.SUBRESOURCE_DEFAULT_OPTIONS;
 
-
-import java.util.ArrayList;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
@@ -39,7 +37,6 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.response.GenericResponse;
@@ -54,6 +51,7 @@ import com.sun.jersey.spi.resource.Singleton;
 @Singleton
 @Path(RESOURCE_PATH_VOLUMES)
 public class VolumesResource {
+	
 	private final GlusterUtil glusterUtil = new GlusterUtil();
 	
 	@InjectParam
@@ -62,12 +60,11 @@ public class VolumesResource {
 	@GET 
 	@Produces(MediaType.TEXT_XML)
 	public VolumeListResponse getAllVolumes() {
-		ProcessResult response = glusterUtil.getVolumeInfo();  
-		if (response.isSuccess()) {
-			return new VolumeListResponse( Status.STATUS_SUCCESS, glusterUtil.getAllVolumes(response.getOutput()) );
-		} else {
-			//TODO: log the error
-			return new VolumeListResponse(Status.STATUS_FAILURE, new  ArrayList<Volume>());
+		try {
+			return new VolumeListResponse(Status.STATUS_SUCCESS, glusterUtil.getAllVolumes());
+		} catch(Exception e) {
+			// TODO: log the error
+			return new VolumeListResponse(new Status(Status.STATUS_CODE_FAILURE, e.getMessage()), null);
 		}
 	}