Merge branch 'tasks'

2 files changed, 38 insertions, 20 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
index 745e460b..40f13fbe 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
@@ -54,6 +54,7 @@ public class RESTConstants {
 	public static final String FORM_PARAM_SOURCE = "source";
 	public static final String FORM_PARAM_TARGET = "target";
 	public static final String FORM_PARAM_BRICKS = "bricks";
+	public static final String FROM_PARAM_AUTO_COMMIT = "autoCommit";
 	
 	public static final String PATH_PARAM_VOLUME_NAME = "volumeName";
 	public static final String PATH_PARAM_CLUSTER_NAME = "clusterName";
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Task.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Task.java
index 9268d060..45eb07ba 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Task.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Task.java
@@ -27,40 +27,57 @@ public abstract class Task {
 	
 	public String[] TASK_TYPE_STR = { "Format Disk", "Migrate Brick", "Volume Rebalance" };
 	
-	private TaskInfo info;
+	private TaskInfo taskInfo;
 	
-	public Task(TASK_TYPE type, String reference, String description) {
-		info = new TaskInfo();
-		info.setId(getTaskType(type) + "-" + reference); // construct id
-		info.setType(type);
-		info.setReference(reference);
-		info.setDescription(description);
+	protected String serverName;
+	
+	public Task(TASK_TYPE type, String reference) {
+		taskInfo = new TaskInfo();
+		taskInfo.setType(type);
+		taskInfo.setId(getTypeStr() + "-" + reference); // construct id
+		taskInfo.setReference(reference);
 	}
-	public Task(TaskInfo info) {
-		setInfo(info);
+	
+	public Task(TaskInfo taskInfo) {
+		setTaskInfo(taskInfo);
 	}
 
-	public String getTaskType(TASK_TYPE type) {
-		return TASK_TYPE_STR[type.ordinal()];
+	public String getTypeStr() {
+		return TASK_TYPE_STR[taskInfo.getType().ordinal()];
+	}
+	
+	public TASK_TYPE getType() {
+		return getTaskInfo().getType();
+	}
+	
+	public String getOnlineServer() {
+		return serverName;
+	}
+	
+	public void setOnlineServer(String serverName) {
+		this.serverName = serverName;
+	}
+	
+	public TaskInfo getTaskInfo() {
+		return taskInfo;
+	}
+	
+	public void setTaskInfo(TaskInfo info) {
+		this.taskInfo = info;  
 	}
 	
 	public abstract String getId();
 
+	public abstract TaskInfo start(); 
+	
 	public abstract TaskInfo resume();
 
 	public abstract TaskInfo stop();
 
 	public abstract TaskInfo pause();
-
-	public abstract TASK_TYPE getType();
 	
-	public abstract TaskInfo getTaskInfo();
+	public abstract TaskInfo status();
 	
-	public TaskInfo getInfo() {
-		return info;
-	}
+	public abstract void setTaskDescription();
 	
-	public void setInfo(TaskInfo info) {
-		this.info = info; // TODO: review assigning reference and copy object 
-	}
 }