Story#34 - Volume logs - REST server changes

5 files changed, 66 insertions, 6 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
index b5b51cfd..3fb22ff6 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
@@ -26,15 +26,22 @@ package com.gluster.storage.management.core.constants;
 public class RESTConstants {
 	// Volumes Resource
 	public static final String RESOURCE_PATH_VOLUMES = "/cluster/volumes";
+	public static final String SUBRESOURCE_DEFAULT_OPTIONS = "defaultoptions";
+	public static final String SUBRESOURCE_OPTIONS = "options";
+	public static final String SUBRESOURCE_LOGS = "logs";
+	
+	
 	public static final String FORM_PARAM_OPERATION = "operation";
 	public static final String FORM_PARAM_VALUE_START = "start";
 	public static final String FORM_PARAM_VALUE_STOP = "stop";
 	public static final String FORM_PARAM_OPTION_KEY = "key";
 	public static final String FORM_PARAM_OPTION_VALUE = "value";
+	
 	public static final String PATH_PARAM_VOLUME_NAME = "volumeName";
-	public static final String SUBRESOURCE_DEFAULT_OPTIONS = "defaultoptions";
-	public static final String SUBRESOURCE_OPTIONS = "options";
 	
+	public static final String QUERY_PARAM_DISK_NAME = "diskName";
+	public static final String QUERY_PARAM_LINE_COUNT = "lineCount";
+
 	// Running tasks resource
 	public static final String RESOURCE_PATH_RUNNING_TASKS = "/cluster/runningtasks";
 	public static final String RESOURCE_PATH_ALERTS = "/cluster/alerts";
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/LogMessage.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/LogMessage.java
index cc3aa043..d81b8d0f 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/LogMessage.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/LogMessage.java
@@ -20,14 +20,24 @@ package com.gluster.storage.management.core.model;
 
 import java.util.Date;
 
+import javax.xml.bind.annotation.XmlRootElement;
+
 import com.gluster.storage.management.core.utils.StringUtil;
 
+@XmlRootElement
 public class LogMessage implements Filterable {
 	private Date timestamp;
 	private Disk disk;
 	private String severity;
 	private String message;
 
+	public LogMessage() {
+	}
+	
+	public LogMessage(String logMessage) {
+		// TODO: Parse the log message and extract fields 
+	}
+	
 	public Date getTimestamp() {
 		return timestamp;
 	}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java
index 45a9842b..95075f78 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java
@@ -59,6 +59,11 @@ public class Status {
 		this.code = result.getExitValue();
 		this.message = result.getOutput();
 	}
+	
+	public Status(Exception e) {
+		this.code = STATUS_CODE_FAILURE;
+		this.message = e.getMessage();
+	}
 
 	@XmlElement(name = "code", type = Integer.class)
 	public Integer getCode() {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/LogMessageListResponse.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/LogMessageListResponse.java
new file mode 100644
index 00000000..191334d3
--- /dev/null
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/LogMessageListResponse.java
@@ -0,0 +1,42 @@
+/**
+ * 
+ */
+package com.gluster.storage.management.core.response;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import com.gluster.storage.management.core.model.LogMessage;
+import com.gluster.storage.management.core.model.Status;
+
+@XmlRootElement(name = "response")
+public class LogMessageListResponse extends AbstractResponse {
+	private List<LogMessage> logMessages = new ArrayList<LogMessage>();
+	
+	public LogMessageListResponse() {
+	}
+	
+	public LogMessageListResponse(Status status, List<LogMessage> logMessages) {
+		setStatus(status);
+		setLogMessages(logMessages);
+	}
+
+	@XmlElementWrapper(name = "logMessages")
+	@XmlElement(name = "logMessage", type = LogMessage.class)
+	public List<LogMessage> getLogMessages() {
+		return logMessages;
+	}
+
+	public void setLogMessages(List<LogMessage> logMessages) {
+		this.logMessages = logMessages;
+	}
+
+	@Override
+	public Object getData() {
+		return getLogMessages();
+	}
+}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/VolumeListResponse.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/VolumeListResponse.java
index fc1c9a6c..97085603 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/VolumeListResponse.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/VolumeListResponse.java
@@ -30,10 +30,6 @@ public class VolumeListResponse extends AbstractResponse {
 		return this.volumes;
 	}
 
-	/**
-	 * @param volumes
-	 *            volumes to set
-	 */
 	public void setVolumes(List<Volume> volumes) {
 		this.volumes = volumes;
 	}