Merge pull request #228 from Dhandapani/master

REST API changes

6 files changed, 19 insertions, 11 deletions

diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java
index 7b81ab87..07c5cc77 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java
@@ -33,7 +33,7 @@ public class VolumeLogTableLabelProvider extends TableLabelProviderAdapter {
 		VolumeLogMessage logMessage = (VolumeLogMessage) element;
 		return (columnIndex == LOG_TABLE_COLUMN_INDICES.DATE.ordinal() ? DateUtil.formatDate(logMessage.getTimestamp()) 
 			: columnIndex == LOG_TABLE_COLUMN_INDICES.TIME.ordinal() ? DateUtil.formatTime(logMessage.getTimestamp())
-			: columnIndex == LOG_TABLE_COLUMN_INDICES.BRICK.ordinal() ? logMessage.getBrickDirectory()
+			: columnIndex == LOG_TABLE_COLUMN_INDICES.BRICK.ordinal() ? logMessage.getBrick()
 			: columnIndex == LOG_TABLE_COLUMN_INDICES.SEVERITY.ordinal() ? "" + logMessage.getSeverity()
 			: columnIndex == LOG_TABLE_COLUMN_INDICES.MESSAGE.ordinal() ? logMessage.getMessage() : "Invalid");
 	}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java
index 2467735f..4b64ea96 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java
@@ -56,7 +56,7 @@ public class InitializeDiskTypeSelection extends Dialog  {
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
 
-		newShell.setText("Gluster Management Console - Select FS Type");
+		newShell.setText("Gluster Management Console - Select File System Type");
 		addEscapeListener(newShell);
 	}
 	
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeLogMessage.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeLogMessage.java
index a5ac1848..7b7b77c8 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeLogMessage.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeLogMessage.java
@@ -67,25 +67,25 @@ public class VolumeLogMessage implements Filterable {
 		this.message = message;
 	}
 	
-	public void setBrickDirectory(String brickDirectory) {
-		this.brick = brickDirectory;
+	public void setBrick(String brick) {
+		this.brick = brick;
 	}
 
-
-	public String getBrickDirectory() {
+	@XmlElement(name = "brick")
+	public String getBrick() {
 		return brick;
 	}
 
 	public VolumeLogMessage(Date timestamp, String brickDirectory, String severity, String message) {
 		setTimestamp(timestamp);
-		setBrickDirectory(brickDirectory);
+		setBrick(brickDirectory);
 		setSeverity(severity);
 		setMessage(message);
 	}
 	
 	@Override
 	public boolean filter(String filterString, boolean caseSensitive) {
-		return StringUtil.filterString(getSeverity() + getTimestamp() + getBrickDirectory() + getMessage(), filterString,
+		return StringUtil.filterString(getSeverity() + getTimestamp() + getBrick() + getMessage(), filterString,
 				caseSensitive);
 	}
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
index f149b214..90442f4a 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
@@ -56,6 +56,7 @@ import javax.ws.rs.core.Response;
 import org.springframework.stereotype.Component;
 
 import com.gluster.storage.management.core.constants.CoreConstants;
+import com.gluster.storage.management.core.constants.GlusterConstants;
 import com.gluster.storage.management.core.constants.RESTConstants;
 import com.gluster.storage.management.core.exceptions.ConnectionException;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
@@ -374,7 +375,8 @@ public class GlusterServersResource extends AbstractResource {
 		}
 		
 		if (fsType == null || fsType.isEmpty()) {
-			return badRequestResponse("Parameter [" + FORM_PARAM_FSTYPE + "] is missing in request!");
+			fsType = GlusterConstants.FSTYPE_DEFAULT;
+			// return badRequestResponse("Parameter [" + FORM_PARAM_FSTYPE + "] is missing in request!");
 		}
 
 		InitializeDiskTask initializeTask = new InitializeDiskTask(clusterService, clusterName, serverName, diskName, fsType);
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
index 0861e1d6..16faf7de 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
@@ -193,7 +193,13 @@ public class TasksResource extends AbstractResource {
 		}
 		
 		if(taskOperation == null || taskOperation.isEmpty()) {
-			return badRequestResponse("Parameter [" + FORM_PARAM_OPERATION + "] is missing in request!");
+			int taskStatus = task.getTaskInfo().getStatus().getCode();
+			if (taskStatus == Status.STATUS_CODE_SUCCESS || taskStatus == Status.STATUS_CODE_FAILURE) {
+				taskOperation = RESTConstants.TASK_DELETE;
+			} else {
+				taskOperation = RESTConstants.TASK_STOP;
+			}
+//			return badRequestResponse("Parameter [" + FORM_PARAM_OPERATION + "] is missing in request!");
 		}
 		
 		if(!taskOperation.equals(RESTConstants.TASK_STOP) && !taskOperation.equals(RESTConstants.TASK_DELETE)) {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
index 618c03af..66c73260 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
@@ -523,7 +523,7 @@ public class VolumeService {
 		// populate disk and trim other fields
 		List<VolumeLogMessage> logMessages = response.getLogMessages();
 		for (VolumeLogMessage logMessage : logMessages) {
-			logMessage.setBrickDirectory(brick.getBrickDirectory());
+			logMessage.setBrick(brick.getQualifiedName());
 		}
 		return logMessages;
 	}