Merge branch 'tasks'

4 files changed, 27 insertions, 29 deletions

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java
index d11decb6..65124bf9 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java
@@ -51,7 +51,7 @@ public interface IImageKeys {
 	public static final String ARROW_UP = "icons/arrow-up.png";
 	public static final String ARROW_DOWN = "icons/arrow-down.png";
 	public static final String VOLUME_REBALANCE = "icons/volume-rebalance.png";
-	public static final String DISK_MIGRATE = "icons/disk-migrate.png";
+	public static final String BRICK_MIGRATE = "icons/disk-migrate.png";
 	public static final String LOW_DISK_SPACE = "icons/disk.png";
 	public static final String DISK_OFFLINE = "icons/status-offline.png";
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java
index 07d6e3c5..60cbd387 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java
@@ -49,10 +49,11 @@ public class MigrateDiskWizard extends Wizard {
 
 		Disk sourceDisk = page.getSourceDisk();
 		Disk targetDisk = page.getTargetDisk();
+		Boolean autoCommit = true; //TODO get auto commit from user selection 
 		// TODO add custom confirm dialog
 		
 		VolumesClient volumesClient = new VolumesClient();
-		volumesClient.startMigration(volume.getName(), sourceDisk.getQualifiedName(), targetDisk.getQualifiedName());
+		volumesClient.startMigration(volume.getName(), sourceDisk.getQualifiedName(), targetDisk.getQualifiedName(), autoCommit);
 		
 		return true;
 	}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java
index e1e25e51..ef14c197 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java
@@ -46,8 +46,8 @@ import com.gluster.storage.management.core.model.EntityGroup;
 import com.gluster.storage.management.core.model.GlusterDataModel;
 import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.model.GlusterServer.SERVER_STATUS;
-import com.gluster.storage.management.core.model.RunningTask;
 import com.gluster.storage.management.core.model.Server;
+import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 import com.gluster.storage.management.core.utils.NumberUtil;
@@ -276,25 +276,23 @@ public class ClusterSummaryView extends ViewPart {
 	private void createRunningTasksSection() {
 		Composite section = guiHelper.createSection(form, toolkit, "Running Tasks", null, 1, false);
 
-		List<RunningTask> runningTasks = cluster.getRunningTasks();
-
-		for (RunningTask task : runningTasks) {
-			addRunningTaskLabel(section, task);
+		for (TaskInfo taskInfo : cluster.getTaskInfoList()) {
+			addTaskLabel(section, taskInfo);
 		}
 	}
 
-	private void addRunningTaskLabel(Composite section, RunningTask task) {
-		// Task related to Volumes context
+	private void addTaskLabel(Composite section, TaskInfo taskInfo) {
+		//TODO: create link and open the task progress view
 		CLabel lblAlert = new CLabel(section, SWT.NONE);
-		lblAlert.setText(task.getTaskInfo());
+		lblAlert.setText(taskInfo.getDescription());
 		
 		Image taskImage = null;
-		switch(task.getType()) {
+		switch(taskInfo.getType()) {
 		case DISK_FORMAT:
 			taskImage = guiHelper.getImage(IImageKeys.DISK);
 			break;
 		case BRICK_MIGRATE:
-			taskImage = guiHelper.getImage(IImageKeys.DISK_MIGRATE);
+			taskImage = guiHelper.getImage(IImageKeys.BRICK_MIGRATE);
 			break;
 		case VOLUME_REBALANCE:
 			taskImage = guiHelper.getImage(IImageKeys.VOLUME_REBALANCE);
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
index 990e569c..311014a0 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
@@ -33,8 +33,10 @@ import org.eclipse.ui.part.ViewPart;
 
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.core.model.Alert;
+import com.gluster.storage.management.core.model.Cluster;
 import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.RunningTask;
+import com.gluster.storage.management.core.model.Task.TASK_TYPE;
+import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 import com.gluster.storage.management.gui.IImageKeys;
@@ -50,6 +52,7 @@ public class VolumesSummaryView extends ViewPart {
 	private final FormToolkit toolkit = new FormToolkit(Display.getCurrent());
 	private ScrolledForm form;
 	private EntityGroup<Volume> volumes;
+	private Cluster cluster = GlusterDataModelManager.getInstance().getModel().getCluster();
 
 	private static final String ALERTS = "Alerts";
 	private static final String RUNNING_TASKS = "Running Tasks";
@@ -88,9 +91,8 @@ public class VolumesSummaryView extends ViewPart {
 
 	private void createAlertsSection() {
 		Composite section = guiHelper.createSection(form, toolkit, ALERTS, null, 1, false);
-		List<Alert> alerts = GlusterDataModelManager.getInstance().getModel().getCluster().getAlerts();
 
-		for (Alert alert : alerts) {
+		for (Alert alert : cluster.getAlerts()) {
 			addAlertLabel(section, alert);
 		}
 	}
@@ -108,25 +110,23 @@ public class VolumesSummaryView extends ViewPart {
 	private void createRunningTasksSection() {
 		Composite section = guiHelper.createSection(form, toolkit, RUNNING_TASKS, null, 1, false);
 
-		List<RunningTask> runningTasks = GlusterDataModelManager.getInstance().getModel().getCluster()
-				.getRunningTasks();
-
-		for (RunningTask task : runningTasks) {
-			addRunningTaskLabel(section, task);
+		for (TaskInfo taskInfo : cluster.getTaskInfoList()) {
+			if (taskInfo.getType() == TASK_TYPE.BRICK_MIGRATE || taskInfo.getType() == TASK_TYPE.VOLUME_REBALANCE)
+			addTaskLabel(section, taskInfo);
 		}
 	}
 
-	private void addRunningTaskLabel(Composite section, RunningTask task) {
+	private void addTaskLabel(Composite section, TaskInfo taskInfo) {
 		// Task related to Volumes context
-		if (task.getType() == RunningTask.TASK_TYPES.BRICK_MIGRATE
-				|| task.getType() == RunningTask.TASK_TYPES.VOLUME_REBALANCE) {
-			if (task.getStatus().isPercentageSupported()) {
-				// TODO Progress bar
+		if (taskInfo.getType() == TASK_TYPE.BRICK_MIGRATE
+				|| taskInfo.getType() == TASK_TYPE.VOLUME_REBALANCE) {
+			if (taskInfo.getStatus().isPercentageSupported()) {
+				// TODO Progress bar or link to progress view
 			}
 			CLabel lblAlert = new CLabel(section, SWT.NONE);
-			lblAlert.setText(task.getTaskInfo());
-			lblAlert.setImage((task.getType() == RunningTask.TASK_TYPES.BRICK_MIGRATE) ? guiHelper
-					.getImage(IImageKeys.DISK_MIGRATE) : guiHelper.getImage(IImageKeys.VOLUME_REBALANCE));
+			lblAlert.setText(taskInfo.getDescription());
+			lblAlert.setImage((taskInfo.getType() == TASK_TYPE.BRICK_MIGRATE) ? guiHelper
+					.getImage(IImageKeys.BRICK_MIGRATE) : guiHelper.getImage(IImageKeys.VOLUME_REBALANCE));
 			lblAlert.redraw();
 		}
 	}
@@ -145,7 +145,6 @@ public class VolumesSummaryView extends ViewPart {
 		createStatusChart(toolkit, section, values);
 	}
 
-	@SuppressWarnings("unchecked")
 	private int getVolumeCountByStatus(EntityGroup<Volume> volumes, VOLUME_STATUS status) {
 		int count = 0;
 		for (Volume volume : (List<Volume>) volumes.getEntities()) {