Merge pull request #88 from Selvasundaram/11b1cfbb18a4deaa63a69868aadfaf51086fb482

Task progress view UI

3 files changed, 9 insertions, 6 deletions

diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/TasksResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/TasksResource.java
index d86cede2..44d86b1b 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/TasksResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/TasksResource.java
@@ -47,6 +47,7 @@ import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.exceptions.GlusterValidationException;
 import com.gluster.storage.management.core.model.Task;
 import com.gluster.storage.management.core.model.TaskInfo;
+import com.gluster.storage.management.core.response.TaskInfoListResponse;
 import com.sun.jersey.spi.resource.Singleton;
 
 @Path(RESOURCE_PATH_CLUSTERS + "/{" + PATH_PARAM_CLUSTER_NAME + "}/" + RESOURCE_TASKS)
@@ -87,7 +88,7 @@ public class TasksResource extends AbstractResource {
 	@Produces(MediaType.APPLICATION_XML)
 	public Response getTasks() {
 		try {
-			return okResponse(getAllTasksInfo(), MediaType.APPLICATION_XML);
+			return okResponse(new TaskInfoListResponse(getAllTasksInfo()), MediaType.APPLICATION_XML);
 		} catch (GlusterRuntimeException e) {
 			return errorResponse(e.getMessage());
 		}
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateDiskTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateDiskTask.java
index 1f044d77..0b1b67e4 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateDiskTask.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateDiskTask.java
@@ -20,6 +20,7 @@
  */
 package com.gluster.storage.management.server.tasks;
 
+import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.Task;
 import com.gluster.storage.management.core.model.TaskInfo;
@@ -83,7 +84,7 @@ public class MigrateDiskTask extends Task {
 		ProcessResult processResult = sshUtil.executeRemote(serverName, command);
 		TaskStatus taskStatus = new TaskStatus();
 		if (processResult.isSuccess()) {
-			if (processResult.getOutput().matches("*started successfully")) {
+			if (processResult.getOutput().trim().matches(".*started successfully$")) {
 				taskStatus.setCode(Status.STATUS_CODE_RUNNING);
 			} else {
 				taskStatus.setCode(Status.STATUS_CODE_FAILURE);
@@ -136,7 +137,7 @@ public class MigrateDiskTask extends Task {
 		ProcessResult processResult = sshUtil.executeRemote(serverName, command);
 		TaskStatus taskStatus = new TaskStatus();
 		if (processResult.isSuccess()) {
-			if (processResult.getOutput().matches("*abort")) {
+			if (processResult.getOutput().trim().matches(".*aborted successfully$")) {
 				taskStatus.setCode(Status.STATUS_CODE_SUCCESS);
 			} else {
 				taskStatus.setCode(Status.STATUS_CODE_FAILURE);
@@ -156,10 +157,12 @@ public class MigrateDiskTask extends Task {
 		ProcessResult processResult = sshUtil.executeRemote(serverName, command);
 		TaskStatus taskStatus = new TaskStatus();
 		if (processResult.isSuccess()) {
-			if (processResult.getOutput().matches("*Migration complete")) {
+			if (processResult.getOutput().trim().matches("^Number of files migrated.*Migration complete$")) {
 				taskStatus.setCode(Status.STATUS_CODE_SUCCESS);
-			} else {
+			} else if (	processResult.getOutput().trim().matches("^Number of files migrated.*Current file=.*")) {
 				taskStatus.setCode(Status.STATUS_CODE_RUNNING);
+			} else {
+				taskStatus.setCode(Status.STATUS_CODE_FAILURE);
 			}
 		} else {
 			taskStatus.setCode(Status.STATUS_CODE_FAILURE);
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
index 767b15c3..aa44b016 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
@@ -550,7 +550,6 @@ public class GlusterUtil {
 		} else {
 			throw new GlusterRuntimeException( migrateDiskTask.getTaskInfo().getStatus().getMessage());
 		}
-		
 		return migrateDiskTask.getId();
 	}