Merge commit 'upstream/master'

Conflicts:
	src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java
	src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java

3 files changed, 54 insertions, 59 deletions

diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java
index 266bd8d3..c4948596 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java
@@ -29,57 +29,54 @@ public class AlertsResource {
 		// Alert #1
 		Alert alert = new Alert();
 		alert.setId("0001");
-		alert.setReference("Server1"); // Server 
+		alert.setReference("Server1"); // Server
 		alert.setType(Alert.ALERT_TYPES.CPU_USAGE_ALERT);
-		alert.setMessage(alert.getAlertType(alert.getType()) + " in server: " + alert.getReference());
+		alert.setMessage(alert.getAlertType(alert.getType()) + " in server [" + alert.getReference() + "]");
 		alerts.add(alert);
-		
+
 		// Alert #2
 		alert = new Alert();
 		alert.setId("0002");
 		alert.setReference("Server2"); // server:Disk - brick
 		alert.setType(Alert.ALERT_TYPES.MEMORY_USAGE_ALERT);
-		alert.setMessage(alert.getAlertType(alert.getType()) + " in server: " + alert.getReference());
+		alert.setMessage(alert.getAlertType(alert.getType()) + " in server [" + alert.getReference() + "]");
 		alerts.add(alert);
-		
+
 		// Alert #3
 		alert = new Alert();
 		alert.setId("0003");
-		alert.setReference("Volume1"); // Volume name 
+		alert.setReference("server1:sda1"); // Disk name
 		alert.setType(Alert.ALERT_TYPES.DISK_USAGE_ALERT);
-		alert.setMessage(alert.getAlertType(alert.getType()) + " in volume: " + alert.getReference());
+		alert.setMessage(alert.getAlertType(alert.getType()) + " in disk [" + alert.getReference() + "]");
 		alerts.add(alert);
-		
+
 		// Alert #4
 		alert = new Alert();
 		alert.setId("0004");
-		alert.setReference("Volume2"); // Volume name 
+		alert.setReference("Volume2:server2:sda1"); // volume:[Disk name]
 		alert.setType(Alert.ALERT_TYPES.OFFLINE_VOLUME_DISKS_ALERT);
-		alert.setMessage("Server1:sda1, server2:sda2 are " + alert.getAlertType(alert.getType()) + " in volume: " + alert.getReference());
+		alert.setMessage(alert.getAlertType(alert.getType()) + " in volume [" + alert.getReference().split(":")[0]
+				+ "] disk [" + alert.getReference().split(":")[1] + ":" + alert.getReference().split(":")[2] + "]");
 		alerts.add(alert);
-		
+
 		// Alert #5
 		alert = new Alert();
 		alert.setId("0005");
-		alert.setReference("Volume2"); // Volume name 
+		alert.setReference("Server2"); // Server name
 		alert.setType(Alert.ALERT_TYPES.OFFLINE_SERVERS_ALERT);
-		alert.setMessage("server1, server2 are " + alert.getAlertType(alert.getType()) + " in volume: " + alert.getReference());
+		alert.setMessage(alert.getAlertType(alert.getType()) + " [" + alert.getReference() + "]");
 		alerts.add(alert);
-		
+
 		return new AlertListResponse(alerts);
 
 	}
-	
-	public static void  main(String[] args) {
+
+	public static void main(String[] args) {
 		/*
-		// Unit test code
-		AlertsResource alertResource = new AlertsResource();
-		AlertsListResponse alertResponse = alertResource.getAlerts();
-		List<Alert> alerts = alertResponse.getAlerts();
-		for (Alert alert: alerts) {
-		    System.out.println(alert.getMessage());
-		}
-		*/
+		 * // Unit test code AlertsResource alertResource = new AlertsResource(); AlertsListResponse alertResponse =
+		 * alertResource.getAlerts(); List<Alert> alerts = alertResponse.getAlerts(); for (Alert alert: alerts) {
+		 * System.out.println(alert.getMessage()); }
+		 */
 	}
 
 }
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java
index 2177085e..ea2cdf5d 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java
@@ -42,7 +42,7 @@ import com.gluster.storage.management.server.runningtasks.managers.RunningTaskMa
 @Component
 @Path(RESOURCE_PATH_RUNNING_TASKS)
 public class RunningTaskResource {
-	
+
 	private static final String PKG = "com.gluster.storage.management.server.runningtasks.managers";
 	private static final String MANAGER = "Manager";
 
@@ -50,55 +50,56 @@ public class RunningTaskResource {
 	@Produces(MediaType.TEXT_XML)
 	public RunningTaskListResponse getRunningTasks() {
 
-		RunningTaskStatus status = new RunningTaskStatus();
-		List<RunningTask> runningTasks = new ArrayList<RunningTask>(); 
-		
-		status.setCode(Status.STATUS_CODE_RUNNING);
-		status.setPercentageSupported(false);
+		RunningTaskStatus taskStatus = new RunningTaskStatus();
+		List<RunningTask> runningTasks = new ArrayList<RunningTask>();
+
+		taskStatus.setCode(Status.STATUS_CODE_RUNNING);
+		taskStatus.setPercentageSupported(false);
 
 		// Volume rebalance
 		RunningTask task = new RunningTask();
 		task.setId("0001");
 		task.setType(RunningTask.TASK_TYPES.VOLUME_REBALANCE);
 		task.setReference("Volume1");
-		task.setTaskInfo( task.getTaskType(task.getType()) +  "is running in volume " + task.getReference());
-		task.setStatus(status);
+		task.setTaskInfo(task.getTaskType(task.getType()) + " on [" + task.getReference() + "]");
+		task.setStatus(taskStatus);
 		runningTasks.add(task);
 
 		task = new RunningTask();
 		task.setId("0002");
 		task.setType(RunningTask.TASK_TYPES.VOLUME_REBALANCE);
 		task.setReference("Volume2");
-		task.setTaskInfo( task.getTaskType(task.getType()) +  " is running in volume " + task.getReference());
-		task.setStatus(status);
+		task.setTaskInfo(task.getTaskType(task.getType()) + " on [" + task.getReference() + "]");
+		task.setStatus(taskStatus);
 		runningTasks.add(task);
 
 		// MigrateDisk
 		task = new RunningTask();
 		task.setId("0003");
-		task.setType(RunningTask.TASK_TYPES.MIGRATE_DISK);
-		task.setReference("Volume3:server1:sda1");  // Disk reference
-		task.setTaskInfo( task.getTaskType(task.getType()) +  " is running in disk " +  task.getReference() + "");
-		task.setStatus(status);
+		task.setType(RunningTask.TASK_TYPES.DISK_MIGRATE);
+		task.setReference("Volume3:server1:sda1"); // Disk reference
+		task.setTaskInfo(task.getTaskType(task.getType()) + " for volume [" + task.getReference().split(":")[0]
+				+ "] disk [" + task.getReference().split(":")[1] + ":" + task.getReference().split(":")[2] + "]");
+		task.setStatus(taskStatus);
 		runningTasks.add(task);
 
 		// FormatDisk
 		task = new RunningTask();
 		task.setId("0004");
-		task.setType(RunningTask.TASK_TYPES.FORMAT_DISK);
-		task.setReference("Volume1:server1:sdb1");  // Disk reference
-		task.setTaskInfo( task.getTaskType(task.getType()) +  " " + task.getReference() );
-		status.setPercentageSupported(true);
-		status.getPercentCompleted(45);
-		task.setStatus(status);
+		task.setType(RunningTask.TASK_TYPES.DISK_FORMAT);
+		task.setReference("server1:sdb1"); // Disk reference
+		task.setTaskInfo(task.getTaskType(task.getType()) + " [" + task.getReference() + "]");
+		taskStatus.setPercentageSupported(true);
+		taskStatus.getPercentCompleted(45);
+		task.setStatus(taskStatus);
 		runningTasks.add(task);
-		
+
 		return new RunningTaskListResponse(Status.STATUS_SUCCESS, runningTasks);
 	}
 
 	@SuppressWarnings("rawtypes")
 	public Response startTask(@FormParam("taskType") RunningTask.TASK_TYPES taskType) {
-		String taskTypeStr =  StringUtil.removeSpaces( new RunningTask().getTaskType(taskType) );
+		String taskTypeStr = StringUtil.removeSpaces(new RunningTask().getTaskType(taskType));
 		String managerClassName = PKG + "." + taskTypeStr + MANAGER;
 
 		Class managerClass;
@@ -120,15 +121,14 @@ public class RunningTaskResource {
 		manager.start();
 		return null;
 	}
-	
+
 	// TODO Remove the test script for production
 	public static void main(String[] args) {
 		RunningTaskResource rt = new RunningTaskResource();
 		RunningTaskListResponse tasks = rt.getRunningTasks();
 		List<RunningTask> runningTasks = tasks.getRunningTasks();
-		for( RunningTask x : runningTasks) {
-			System.out.println( x.getId() +  " : " + x.getType() +  " : " + x.getTaskInfo() );
+		for (RunningTask x : runningTasks) {
+			System.out.println(x.getId() + " : " + x.getType() + " : " + x.getTaskInfo());
 		}
 	}
 }
-
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
index 19310240..22ef2462 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
@@ -57,28 +57,26 @@ import com.sun.jersey.spi.resource.Singleton;
 @Singleton
 @Path(RESOURCE_PATH_VOLUMES)
 public class VolumesResource {
-	
 	private static final String SCRIPT_NAME = "CreateVolumeExportDirectory.py";
 	
 	@Autowired
 	private static ServerUtil serverUtil;
-	
 	private final GlusterUtil glusterUtil = new GlusterUtil();
-	
+
 	@InjectParam
 	private VolumeOptionsDefaults volumeOptionsDefaults;
 
-	@GET 
+	@GET
 	@Produces(MediaType.TEXT_XML)
 	public VolumeListResponse getAllVolumes() {
 		try {
 			return new VolumeListResponse(Status.STATUS_SUCCESS, glusterUtil.getAllVolumes());
-		} catch(Exception e) {
+		} catch (Exception e) {
 			// TODO: log the error
 			return new VolumeListResponse(new Status(Status.STATUS_CODE_FAILURE, e.getMessage()), null);
 		}
 	}
-	
+
 	@POST
 	@Consumes(MediaType.TEXT_XML)
 	@Produces(MediaType.TEXT_XML)
@@ -120,12 +118,13 @@ public class VolumesResource {
 		}
 		return new Status(Status.STATUS_CODE_FAILURE, "Invalid operation code [" + operation + "]");
 	}
-	
+
 	@GET
 	@Path(SUBRESOURCE_DEFAULT_OPTIONS)
 	@Produces(MediaType.TEXT_XML)
 	public VolumeOptionInfoListResponse getDefaultOptions() {
-		// TODO: Fetch all volume options with their default values from GlusterFS
+		// TODO: Fetch all volume options with their default values from
+		// GlusterFS
 		// whenever such a CLI command is made available in GlusterFS
 		return new VolumeOptionInfoListResponse(Status.STATUS_SUCCESS, volumeOptionsDefaults.getDefaults());
 	}
@@ -140,7 +139,6 @@ public class VolumesResource {
 			return serverName + ":" + dirName;
 		} else {
 			return null;
-			// return result.getMessage();
 		}
 		
 	}