Replace-brick wont work if volume name contains hyphen - fix

4 files changed, 9 insertions, 8 deletions

diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CommitTaskAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CommitTaskAction.java
index ea47bd8f..e2e1e12c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CommitTaskAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CommitTaskAction.java
@@ -36,7 +36,7 @@ public class CommitTaskAction extends AbstractActionDelegate {
 			@Override
 			public void run() {
 				try {
-					String volumeName = taskInfo.getReference().split("-")[0]; //Extract volume name from reference
+					String volumeName = taskInfo.getReference().split("#")[0]; //Extract volume name from reference
 					Volume oldVolume = modelManager.getModel().getCluster().getVolume(volumeName);
 					Volume newVolume = (new VolumesClient()).getVolume(volumeName);
 					
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
index 2f7c2fb9..21c66b35 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
@@ -80,7 +80,7 @@ public class MigrateBrickWizard extends Wizard {
 			TaskInfo taskInfo = taskClient.getTaskInfo(uri);
 			if (taskInfo != null && taskInfo instanceof TaskInfo) {
 				// cluster.addTaskInfo(taskInfo);
-				String volumeName = taskInfo.getReference().split("-")[0];
+				String volumeName = taskInfo.getReference().split("#")[0];
 				modelManager.addTask(taskInfo);
 				modelManager.refreshVolumeData(cluster.getVolume(volumeName));
 				
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/BricksPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/BricksPage.java
index 39e79beb..5d526c32 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/BricksPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/BricksPage.java
@@ -79,6 +79,7 @@ public class BricksPage extends AbstractTableViewerPage<Brick> {
 					}
 					tableViewer.update(updatedBricks, null);
 					parent.update();
+					tableViewer.refresh(true);
 				default:
 					break;
 				}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java
index b84f90f6..4d63e872 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java
@@ -69,7 +69,7 @@ public class MigrateBrickTask extends Task {
 
 	public MigrateBrickTask(ClusterService clusterService, String clusterName, String volumeName, String fromBrick,
 			String toBrick) {
-		super(clusterService, clusterName, TASK_TYPE.BRICK_MIGRATE, volumeName + "-" + fromBrick + "-" + toBrick,
+		super(clusterService, clusterName, TASK_TYPE.BRICK_MIGRATE, volumeName + "#" + fromBrick + "#" + toBrick,
 				"Brick Migration on volume [" + volumeName + "] from [" + fromBrick + "] to [" + toBrick + "]", true,
 				true, true);
 		setFromBrick(fromBrick);
@@ -106,7 +106,7 @@ public class MigrateBrickTask extends Task {
 	}
 
 	private void startMigration(String onlineServerName) {
-		String volumeName = getTaskInfo().getReference().split("-")[0];
+		String volumeName = getTaskInfo().getReference().split("#")[0];
 		ProcessResult processResult = glusterUtil.executeBrickMigration(onlineServerName, volumeName,
 				getFromBrick(), getToBrick(), "start");
 		if (processResult.getOutput().trim().matches(".*started successfully$")) {
@@ -132,7 +132,7 @@ public class MigrateBrickTask extends Task {
 	}
 
 	private void pauseMigration(String onlineServer) {
-		String volumeName = getTaskInfo().getReference().split("-")[0];
+		String volumeName = getTaskInfo().getReference().split("#")[0];
 		ProcessResult processResult = glusterUtil.executeBrickMigration(onlineServer, volumeName,
 				getFromBrick(), getToBrick(), "pause");
 		TaskStatus taskStatus = new TaskStatus();
@@ -165,7 +165,7 @@ public class MigrateBrickTask extends Task {
 	}
 	
 	private void commitMigration(String serverName) {
-		String volumeName = getTaskInfo().getReference().split("-")[0];
+		String volumeName = getTaskInfo().getReference().split("#")[0];
 		ProcessResult processResult = glusterUtil.executeBrickMigration(serverName, volumeName,
 				getFromBrick(), getToBrick(), "commit");
 		TaskStatus taskStatus = new TaskStatus();
@@ -194,7 +194,7 @@ public class MigrateBrickTask extends Task {
 	}
 
 	private void stopMigration(String serverName) {
-		String volumeName = getTaskInfo().getReference().split("-")[0];
+		String volumeName = getTaskInfo().getReference().split("#")[0];
 		ProcessResult processResult = glusterUtil.executeBrickMigration(serverName, volumeName, getFromBrick(),
 				getToBrick(), "abort");
 		TaskStatus taskStatus = new TaskStatus();
@@ -227,7 +227,7 @@ public class MigrateBrickTask extends Task {
 
 		TaskStatus taskStatus = new TaskStatus();
 		try {
-			String volumeName = getTaskInfo().getReference().split("-")[0];
+			String volumeName = getTaskInfo().getReference().split("#")[0];
 			ProcessResult processResult = glusterUtil.executeBrickMigration(serverName, volumeName,
 					getFromBrick(), getToBrick(), "status");
 			String output = processResult.getOutput().trim();