Merge branch 'work'

16 files changed, 68 insertions, 42 deletions

diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/replace-brick.png b/src/com.gluster.storage.management.gui/icons/tango/16x16/replace-brick.png
new file mode 100644
index 00000000..828ede1b
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/16x16/replace-brick.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/disk-initialisation.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/disk-initialisation.png
new file mode 100644
index 00000000..73ecf4c0
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/disk-initialisation.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/high-memory-usage.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/high-memory-usage.png
new file mode 100644
index 00000000..b7c166ab
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/high-memory-usage.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/low-diskspace.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/low-diskspace.png
new file mode 100644
index 00000000..983012ad
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/low-diskspace.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-brick.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-brick.png
new file mode 100644
index 00000000..e0528241
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-brick.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-server.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-server.png
new file mode 100644
index 00000000..5900c724
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-server.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/replace-brick.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/replace-brick.png
new file mode 100644
index 00000000..48a66c8c
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/replace-brick.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/server-warning.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/server-warning.png
new file mode 100644
index 00000000..9e2da0bc
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/server-warning.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/volume-rebalance.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/volume-rebalance.png
new file mode 100644
index 00000000..4539822c
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/volume-rebalance.png
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java
index 62d67e43..d4000fab 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java
@@ -83,7 +83,7 @@ public class DeviceTableLabelProvider extends LabelProvider implements ITableLab
 			case UNINITIALIZED:
 				return guiHelper.getImage(IImageKeys.DISK_UNINITIALIZED);
 			case INITIALIZING:
-				return guiHelper.getImage(IImageKeys.DISK_INITIALIZING);
+				return guiHelper.getImage(IImageKeys.DISK_INITIALIZING_SMALL);
 			default:
 				throw new GlusterRuntimeException("Invalid disk status [" + status + "]");
 			}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
index 54407fbd..07aa37da 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
@@ -396,7 +396,7 @@ public class GlusterDataModelManager {
 
 	public void initializeTasks(Cluster cluster) {
 		List<TaskInfo> taskInfoList = new TasksClient(cluster.getName()).getAllTasks();
-		// List<TaskInfo> taskInfoList = getDummyTasks();
+		//List<TaskInfo> taskInfoList = getDummyTasks();
 		cluster.setTaskInfoList(taskInfoList);
 	}
 
@@ -409,40 +409,65 @@ public class GlusterDataModelManager {
 		taskInfo.setName("Migrate Brick-music");
 		taskInfo.setPauseSupported(true);
 		taskInfo.setStopSupported(true);
-		taskInfo.setStatus(new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, "")));
+		taskInfo.setStatus(new TaskStatus(new Status(Status.STATUS_CODE_PAUSE, "")));
 		
-		taskInfo.getStatus().setMessage("Migrating file xxxxx to yyyy");
-		taskInfo.setDescription("Migrate Brick on volume [music] from /export/adb/music to /export/sdc/music.");
+		taskInfo.getStatus().setMessage("Paused");
+		taskInfo.setDescription("Migrate Brick on volume [Movies] from /export/adb/music to /export/sdc/music.");
 		taskInfoList.add(taskInfo);
+		
 		// Task #2
 		taskInfo = new TaskInfo();
 		taskInfo.setType(TASK_TYPE.DISK_FORMAT);
-		taskInfo.setName("Format Disk-server1:sdc");
+		taskInfo.setName("Initialize disk [KVM-GVSA1:sdc]");
 		taskInfo.setPauseSupported(false);
 		taskInfo.setStopSupported(false);
-		taskInfo.setStatus( new TaskStatus(new Status(Status.STATUS_CODE_FAILURE, ""))); 
-		taskInfo.getStatus().setMessage("Format completes 80% ...");
-		taskInfo.setDescription("Formatting disk server1:sdc.");
+		taskInfo.setStatus( new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, ""))); 
+		taskInfo.getStatus().setMessage("Format completed 80% ...");
+		taskInfo.setDescription("Formatting disk [KVM-GVSA1:sdc]");
 		taskInfoList.add(taskInfo);
 
+		// Task #2
+		taskInfo = new TaskInfo();
+		taskInfo.setType(TASK_TYPE.VOLUME_REBALANCE);
+		taskInfo.setName("Rebalance volume [songs]");
+		taskInfo.setPauseSupported(false);
+		taskInfo.setStopSupported(false);
+		taskInfo.setStatus( new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, ""))); 
+		taskInfo.getStatus().setMessage("Rebalance step1: layout fix in progress");
+		taskInfo.setDescription("Rebalance volume [songs]");
+		taskInfoList.add(taskInfo);
+		
 		return taskInfoList;
 	}
 	
-	private List<Alert> getDummyAlerts() {
+	private List<Alert> getDummyAlerts(Cluster cluster) {
 		List<Alert> alerts = new ArrayList<Alert>();
-		for (Server server : model.getCluster().getServers()) {
+		for (Server server : cluster.getServers()) {
 			if (alerts.size() == 0) {
 				alerts.add(new Alert(ALERT_TYPES.CPU_USAGE_ALERT, server.getName(),
-						Alert.ALERT_TYPE_STR[ALERT_TYPES.CPU_USAGE_ALERT.ordinal()] + "[" + server.getCpuUsage()
-								+ "] in " + server.getName()));
+						Alert.ALERT_TYPE_STR[ALERT_TYPES.CPU_USAGE_ALERT.ordinal()] + " [93.42 %] in "
+								+ server.getName()));
 				continue;
 			}
 
 			if (alerts.size() == 1) {
-				Double memoryUtilized = server.getMemoryInUse() / server.getTotalMemory() * 100d;
 				alerts.add(new Alert(ALERT_TYPES.MEMORY_USAGE_ALERT, server.getName(),
-						Alert.ALERT_TYPE_STR[ALERT_TYPES.MEMORY_USAGE_ALERT.ordinal()] + "[" + memoryUtilized + "%] in "
-						+ server.getName()));
+						Alert.ALERT_TYPE_STR[ALERT_TYPES.MEMORY_USAGE_ALERT.ordinal()] + " [91.83 %] in "
+								+ server.getName()));
+				continue;
+			}
+
+			if (alerts.size() == 2) {
+				alerts.add(new Alert(ALERT_TYPES.OFFLINE_SERVERS_ALERT, server.getName(),
+						Alert.ALERT_TYPE_STR[ALERT_TYPES.OFFLINE_SERVERS_ALERT.ordinal()] + " " + server.getName()));
+				continue;
+			}
+			
+			if (alerts.size() == 3) {
+				alerts.add(new Alert(ALERT_TYPES.DISK_USAGE_ALERT, server.getName(),
+						Alert.ALERT_TYPE_STR[ALERT_TYPES.DISK_USAGE_ALERT.ordinal()] + " in " + server.getName() + ":" + "sdc"));
+				alerts.add(new Alert(ALERT_TYPES.OFFLINE_VOLUME_BRICKS_ALERT, "songs",
+						Alert.ALERT_TYPE_STR[ALERT_TYPES.OFFLINE_VOLUME_BRICKS_ALERT.ordinal()] + " [KVM-GVSA4:/export/hdb4/songs] in volume [songs]"));
 				continue;
 			}
 		}
@@ -453,7 +478,7 @@ public class GlusterDataModelManager {
 		AlertsManager alertsManager = new AlertsManager(cluster);
 		alertsManager.buildAlerts();
 		cluster.setAlerts( alertsManager.getAlerts() );
-		// cluster.addAlerts( getDummyAlerts() );
+		//cluster.setAlerts( getDummyAlerts(cluster) );
 	}
 
 
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 72f9bd0b..1b895337 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
@@ -24,8 +24,8 @@ public interface IImageKeys {
 	public static final String SERVERS = "icons/tango/16x16/servers.png";
 	public static final String VOLUME = "icons/tango/16x16/volume.png";
 	public static final String SERVER = "icons/tango/16x16/server.png";
-	public static final String SERVER_WARNING = "icons/server-warning.png";
-	public static final String MEMORY_USAGE_ALERT = "icons/tango/16x16/high-memory-usage.svg";
+	public static final String SERVER_WARNING = "icons/tango/22x22/server-warning.png";
+	public static final String MEMORY_USAGE_ALERT = "icons/tango/22x22/high-memory-usage.png";
 	public static final String GSN = "icons/gsn.png";
 	public static final String SETTINGS = "icons/settings.png";
 	public static final String ADD = "icons/plus-white.png";
@@ -35,7 +35,7 @@ public interface IImageKeys {
 	public static final String STOP_VOLUME = "icons/tango/32x32/stop-volume.svg";
 	public static final String RESET_VOLUME_OPTIONS = "icons/tango/32x32/reset-volume-option.svg";
 	public static final String VOLUME_OPTIONS = "icons/tango/16x16/volume-options.png";
-	public static final String SERVER_OFFLINE = "icons/tango/16x16/offline-server.png";
+	public static final String SERVER_OFFLINE = "icons/tango/22x22/offline-server.png";
 	
 	public static final String CREATE_VOLUME_BIG = "icons/tango/48x48/create-volume.svg";
 	public static final String REMOVE_VOLUME = "icons/tango/32x32/remove-volume.png";
@@ -55,20 +55,23 @@ public interface IImageKeys {
 	public static final String DISK_UNINITIALIZED = "icons/tango/16x16/disk-uninitialized.png";
 	public static final String IO_ERROR = "icons/tango/16x16/disk-error.png";
 	public static final String DISK_AVAILABLE = "icons/tango/16x16/disk-available.png";
-	public static final String DISK_INITIALIZING = "icons/tango/16x16/disk-initialisation.png";
+	public static final String DISK_INITIALIZING_SMALL = "icons/tango/16x16/disk-initialisation.png";
+	public static final String DISK_INITIALIZING = "icons/tango/22x22/disk-initialisation.png";
 	public static final String DISK_IN_USE = "icons/tango/16x16/disk-inuse.png";
 	
 	public static final String SEARCH = "icons/tango/22x22/system-search.png";
 	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/tango/32x32/volume-rebalance.svg";
+	public static final String VOLUME_REBALANCE_SMALL = "icons/tango/22x22/volume-rebalance.png";
 	public static final String BRICK_MIGRATE = "icons/tango/32x32/replace-brick.svg";
+	public static final String BRICK_MIGRATE_SMALL = "icons/tango/22x22/replace-brick.png";
 	public static final String DOWNLOAD_LOG = "icons/tango/32x32/download-log.svg";
 	public static final String ADD_BRICK = "icons/tango/32x32/add-brick.svg";
 	public static final String REMOVE_BRICK = "icons/tango/32x32/remove-brick.svg";
-	public static final String LOW_DISK_SPACE = "icons/tango/16x16/low-diskspace.svg";
+	public static final String LOW_DISK_SPACE = "icons/tango/22x22/low-diskspace.png";
 	public static final String DISK_OFFLINE = "icons/status-offline.png";
-	public static final String BRICK_OFFLINE = "icons/status-offline.png";
+	public static final String BRICK_OFFLINE = "icons/tango/22x22/offline-brick.png";
 	
 	public static final String bricks = "icons/tango/16x16/bricks.png";
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java
index a5b64e28..5da0353a 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java
@@ -65,7 +65,7 @@ public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter {
 			case UNINITIALIZED:
 				return guiHelper.getImage(IImageKeys.DISK_UNINITIALIZED);
 			case INITIALIZING:
-				return guiHelper.getImage(IImageKeys.DISK_INITIALIZING);
+				return guiHelper.getImage(IImageKeys.DISK_INITIALIZING_SMALL);
 			default:
 				throw new GlusterRuntimeException("Invalid disk status [" + status + "]");
 			}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java
index cb59c310..e4bb2692 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java
@@ -76,16 +76,14 @@ public class MigrateBrickPage1 extends WizardPage {
 			
 			@Override
 			public String getColumnText(Object element, int columnIndex) {
-				if (!(element instanceof Disk)) {
+				if (!(element instanceof Device)) {
 					return null;
 				}
-				Disk disk = (Disk) element;
-				return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServerName()
-						: columnIndex == DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY.ordinal() ? disk.getMountPoint() + "/" + volumeName
-								: columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? NumberUtil
-										.formatNumber(disk.getFreeSpace() / 1024 )  /* Coverted to GB */
-										: columnIndex == DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? NumberUtil
-												.formatNumber(disk.getSpace() / 1024) : "Invalid");
+				Device device = (Device) element;
+				return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? device.getServerName()
+						: columnIndex == DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY.ordinal() ? device.getMountPoint() + "/" + volumeName
+						: columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? NumberUtil.formatNumber(device.getFreeSpace() / 1024 )  /* Coverted to GB */
+						: columnIndex == DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? NumberUtil.formatNumber(device.getSpace() / 1024) : "Invalid");
 			}
 		};
 	}
@@ -207,18 +205,18 @@ public class MigrateBrickPage1 extends WizardPage {
 		Text txtFilterFrom = guiHelper.createFilterText(container);
 		Text txtFilterTo = guiHelper.createFilterText(container);
 		
-		ITableLabelProvider diskLabelProvider = getDiskLabelProvider(volume.getName());
+		ITableLabelProvider deviceLabelProvider = getDiskLabelProvider(volume.getName());
 
 		GlusterDataModelManager glusterDataModelManager = GlusterDataModelManager.getInstance();
 		List<Device> fromBricks = glusterDataModelManager.getReadyDevicesOfVolume(volume);
 		List<Device> toDevices = glusterDataModelManager.getReadyDevicesOfAllServersExcluding( fromBricks );
 		
-		tableViewerFrom = createTableViewer(container, diskLabelProvider, fromBricks, txtFilterFrom);
+		tableViewerFrom = createTableViewer(container, deviceLabelProvider, fromBricks, txtFilterFrom);
 		
 		if(fromBrick != null) {
 			setFromDisk(tableViewerFrom, fromBrick);
 		}
-		tableViewerTo = createTableViewer(container, diskLabelProvider, toDevices, txtFilterTo);
+		tableViewerTo = createTableViewer(container, deviceLabelProvider, toDevices, txtFilterTo);
 		
 		// Auto commit selection field
 		Composite autoCommitContainer = new Composite(container, SWT.NONE);
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 e06f3386..a358066d 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
@@ -312,13 +312,13 @@ public class ClusterSummaryView extends ViewPart {
 		Image taskImage = null;
 		switch(taskInfo.getType()) {
 		case DISK_FORMAT:
-			taskImage = guiHelper.getImage(IImageKeys.DISK);
+			taskImage = guiHelper.getImage(IImageKeys.DISK_INITIALIZING);
 			break;
 		case BRICK_MIGRATE:
-			taskImage = guiHelper.getImage(IImageKeys.BRICK_MIGRATE);
+			taskImage = guiHelper.getImage(IImageKeys.BRICK_MIGRATE_SMALL);
 			break;
 		case VOLUME_REBALANCE:
-			taskImage = guiHelper.getImage(IImageKeys.VOLUME_REBALANCE);
+			taskImage = guiHelper.getImage(IImageKeys.VOLUME_REBALANCE_SMALL);
 			break;
 		}
 		lblAlert.setImage(taskImage);
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java
index b064d997..197b925f 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java
@@ -154,7 +154,7 @@ public class GlusterServersSummaryView extends ViewPart {
 		Composite section = guiHelper.createSection(form, toolkit, "Running Tasks", null, 1, false);
 
 		for (TaskInfo taskInfo : GlusterDataModelManager.getInstance().getModel().getCluster().getTaskInfoList()) {
-			if (taskInfo.getType() != TASK_TYPE.VOLUME_REBALANCE) { // Exclude volume related tasks
+			if (taskInfo.getType() != TASK_TYPE.VOLUME_REBALANCE && taskInfo.getType() != TASK_TYPE.BRICK_MIGRATE) { // Exclude volume related tasks
 				addTaskLabel(section, taskInfo);
 			}
 		}
@@ -167,13 +167,13 @@ public class GlusterServersSummaryView extends ViewPart {
 		Image taskImage = null;
 		switch(taskInfo.getType()) {
 		case DISK_FORMAT:
-			taskImage = guiHelper.getImage(IImageKeys.DISK);
+			taskImage = guiHelper.getImage(IImageKeys.DISK_INITIALIZING);
 			break;
 		case BRICK_MIGRATE:
-			taskImage = guiHelper.getImage(IImageKeys.BRICK_MIGRATE);
+			taskImage = guiHelper.getImage(IImageKeys.BRICK_MIGRATE_SMALL);
 			break;
 		case VOLUME_REBALANCE:
-			taskImage = guiHelper.getImage(IImageKeys.VOLUME_REBALANCE);
+			taskImage = guiHelper.getImage(IImageKeys.VOLUME_REBALANCE_SMALL);
 			break;
 		}
 		lblAlert.setImage(taskImage);