5 files changed, 32 insertions, 21 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java
index c0077a30..db8a9018 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java
@@ -6,11 +6,11 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class Alert {
 
 	public enum ALERT_TYPES {
-		CPU_USAGE_ALERT, MEMORY_USAGE_ALERT, DISK_USAGE_ALERT, OFFLINE_VOLUME_DISKS_ALERT, OFFLINE_SERVERS_ALERT
+		CPU_USAGE_ALERT, MEMORY_USAGE_ALERT, DISK_USAGE_ALERT, OFFLINE_VOLUME_BRICKS_ALERT, OFFLINE_SERVERS_ALERT
 	};
 
 	public static final String[] ALERT_TYPE_STR = { "High CPU Usage", "High Memory Usage", "Low Disk Space",
-			"Offline Disk", "Offline Server" };
+			"Offline Brick", "Offline Server" };
 
 	protected String id;
 	protected ALERT_TYPES type;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java
index eed67904..40de70ec 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java
@@ -34,7 +34,7 @@ public class GlusterDummyModel {
 	private GlusterServer server1, server2, server3, server4, server5;
 	private Volume volume1, volume2, volume3, volume4, volume5;
 	private Disk s1da, s1db, s2da, s2db, s2dc, s2dd, s3da, s4da, s5da, s5db;
-	private static List<LogMessage> logMessages = new ArrayList<LogMessage>();
+	private static List<VolumeLogMessage> logMessages = new ArrayList<VolumeLogMessage>();
 	private static GlusterDummyModel instance = new GlusterDummyModel();
 	private GlusterDataModel model;
 
@@ -212,21 +212,21 @@ public class GlusterDummyModel {
 		cluster.setAutoDiscoveredServers(servers);
 	}
 
-	private void addMessages(List<LogMessage> messages, Disk disk, String severity, int count) {
+	private void addMessages(List<VolumeLogMessage> messages, Disk disk, String severity, int count) {
 		for (int i = 1; i <= count; i++) {
 			String message = severity + "message" + i;
-			messages.add(new LogMessage(new Date(), disk.getQualifiedName(), severity, message));
+			messages.add(new VolumeLogMessage(new Date(), disk.getQualifiedName(), disk.getMountPoint(), severity, message));
 		}
 	}
 
-	private void addMessagesForDisk(List<LogMessage> logMessages, Disk disk) {
+	private void addMessagesForDisk(List<VolumeLogMessage> logMessages, Disk disk) {
 		addMessages(logMessages, disk, "SEVERE", 5);
 		addMessages(logMessages, disk, "WARNING", 5);
 		addMessages(logMessages, disk, "DEBUG", 5);
 		addMessages(logMessages, disk, "INFO", 5);
 	}
 
-	public List<LogMessage> createDummyLogMessages() {
+	public List<VolumeLogMessage> createDummyLogMessages() {
 		addMessagesForDisk(logMessages, s1da);
 		addMessagesForDisk(logMessages, s1db);
 		addMessagesForDisk(logMessages, s2da);
@@ -239,7 +239,7 @@ public class GlusterDummyModel {
 		return logMessages;
 	}
 
-	public static List<LogMessage> getDummyLogMessages() {
+	public static List<VolumeLogMessage> getDummyLogMessages() {
 		return logMessages;
 	}
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/RunningTask.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/RunningTask.java
index 24b342e2..773137bb 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/RunningTask.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/RunningTask.java
@@ -23,10 +23,10 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement
 public class RunningTask {
 	public enum TASK_TYPES {
-		DISK_FORMAT, DISK_MIGRATE, VOLUME_REBALANCE
+		DISK_FORMAT, BRICK_MIGRATE, VOLUME_REBALANCE
 	};
 
-	public String[] TASK_TYPE_STR = { "Formatting Disk", "Disk Migration", "Volume Rebalance" };
+	public String[] TASK_TYPE_STR = { "Formatting Disk", "Brick Migration", "Volume Rebalance" };
 
 	protected String id;
 	protected TASK_TYPES type;
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/VolumeLogMessage.java
index 15c758a1..ab88d917 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/VolumeLogMessage.java
@@ -28,17 +28,18 @@ import com.gluster.storage.management.core.model.adapters.VolumeLogDateAdapter;
 import com.gluster.storage.management.core.utils.StringUtil;
 
 @XmlRootElement
-public class LogMessage implements Filterable {
+public class VolumeLogMessage implements Filterable {
 	private Date timestamp;
 	// TODO: Replace disk with brick, rename class as VolumeLogMessage
+	private String brick;
 	private String disk;
 	private String severity;
 	private String message;
 
-	public LogMessage() {
+	public VolumeLogMessage() {
 	}
 	
-	public LogMessage(String logMessage) {
+	public VolumeLogMessage(String logMessage) {
 		// TODO: Parse the log message and extract fields 
 	}
 	
@@ -75,17 +76,27 @@ public class LogMessage implements Filterable {
 	public void setMessage(String message) {
 		this.message = message;
 	}
+	
+	public void setBrickDirectory(String brickDirectory) {
+		this.brick = brickDirectory;
+	}
+
+	public String getBrickDirectory() {
+		return brick;
+	}
 
-	public LogMessage(Date timestamp, String disk, String severity, String message) {
+	public VolumeLogMessage(Date timestamp, String disk, String brickDirectory, String severity, String message) {
 		setTimestamp(timestamp);
 		setDisk(disk);
+		setBrickDirectory(brickDirectory);
 		setSeverity(severity);
 		setMessage(message);
 	}
-
+	
 	@Override
 	public boolean filter(String filterString, boolean caseSensitive) {
 		return StringUtil.filterString(getSeverity() + getTimestamp() + getDisk() + getMessage(), filterString,
 				caseSensitive);
 	}
+
 }
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
index 191334d3..be374e8b 100644
--- 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
@@ -10,28 +10,28 @@ 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.VolumeLogMessage;
 import com.gluster.storage.management.core.model.Status;
 
 @XmlRootElement(name = "response")
 public class LogMessageListResponse extends AbstractResponse {
-	private List<LogMessage> logMessages = new ArrayList<LogMessage>();
+	private List<VolumeLogMessage> logMessages = new ArrayList<VolumeLogMessage>();
 	
 	public LogMessageListResponse() {
 	}
 	
-	public LogMessageListResponse(Status status, List<LogMessage> logMessages) {
+	public LogMessageListResponse(Status status, List<VolumeLogMessage> logMessages) {
 		setStatus(status);
 		setLogMessages(logMessages);
 	}
 
 	@XmlElementWrapper(name = "logMessages")
-	@XmlElement(name = "logMessage", type = LogMessage.class)
-	public List<LogMessage> getLogMessages() {
+	@XmlElement(name = "logMessage", type = VolumeLogMessage.class)
+	public List<VolumeLogMessage> getLogMessages() {
 		return logMessages;
 	}
 
-	public void setLogMessages(List<LogMessage> logMessages) {
+	public void setLogMessages(List<VolumeLogMessage> logMessages) {
 		this.logMessages = logMessages;
 	}