Merge branch 'disk-to-brick'

Conflicts:
	src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AbstractServersResource.java

6 files changed, 52 insertions, 24 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 c25d186a..1b70b84d 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
@@ -33,6 +33,7 @@ public class RESTConstants {
 	public static final String SUBRESOURCE_DISKS = "disks";
 	
 	
+	public static final String FORM_PARAM_DISKS = "disks";
 	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";
@@ -40,14 +41,16 @@ public class RESTConstants {
 	public static final String FORM_PARAM_VALUE_STATUS = "status";
 	public static final String FORM_PARAM_OPTION_KEY = "key";
 	public static final String FORM_PARAM_OPTION_VALUE = "value";
-	public static final String FORM_PARAM_VALUE_SOURCE = "source";
-	public static final String FORM_PARAM_VALUE_TARGET = "target";
+	public static final String FORM_PARAM_SOURCE = "source";
+	public static final String FORM_PARAM_TARGET = "target";
+	public static final String FORM_PARAM_BRICKS = "bricks";
 	
 	public static final String PATH_PARAM_VOLUME_NAME = "volumeName";
 	public static final String FORM_PARAM_DELETE_OPTION = "value";
 	
 	public static final String QUERY_PARAM_DISK_NAME = "diskName";
 	public static final String QUERY_PARAM_DISKS = "disks";
+	public static final String QUERY_PARAM_BRICKS = "bricks";
 	public static final String QUERY_PARAM_LINE_COUNT = "lineCount";
 	public static final String QUERY_PARAM_VOLUME_NAME = "volumeName";
 	public static final String QUERY_PARAM_DELETE_OPTION = "deleteOption";
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Brick.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Brick.java
index 144eefb2..83acb9a3 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Brick.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Brick.java
@@ -20,20 +20,38 @@ package com.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-@XmlRootElement(name = "Bricks")
-public class Brick {
+import com.gluster.storage.management.core.utils.StringUtil;
+
+@XmlRootElement
+public class Brick extends Entity {
+	public enum BRICK_STATUS {ONLINE, OFFLINE};
+	private String[] BRICK_STATUS_STR = {"Online", "Offline"};
 
 	private String serverName;
 	private String diskName;
 	private String brickDirectory;
+	private BRICK_STATUS status;
 
 	public Brick() {
 	}
+	
+	public BRICK_STATUS getStatus() {
+		return status;
+	}
 
-	public Brick(String serverName, String diskName, String brickDirectory) {
-		this.serverName = serverName;
-		this.diskName = diskName;
-		this.brickDirectory = brickDirectory;
+	public String getStatusStr() {
+		return BRICK_STATUS_STR[getStatus().ordinal()];
+	}
+	
+	public void setStatus(BRICK_STATUS status) {
+		this.status = status;
+	}
+
+	public Brick(String serverName, BRICK_STATUS brickStatus, String diskName, String brickDirectory) {
+		setServerName(serverName);
+		setStatus(brickStatus);
+		setDiskName(diskName);
+		setBrickDirectory(brickDirectory);
 	}
 
 	public void setServerName(String serverName) {
@@ -60,7 +78,13 @@ public class Brick {
 		return diskName;
 	}
 
-	public String getQualifiedBrickName() {
+	public String getQualifiedName() {
 		return serverName + ":" + brickDirectory;
 	}
+
+	public boolean filter(String filterString, boolean caseSensitive) {
+		return StringUtil.filterString(getServerName() + getBrickDirectory() + getDiskName(), filterString,
+				caseSensitive);
+	}
+
 }
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
index 1a62b293..adeb72dc 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
@@ -139,4 +139,13 @@ public class Cluster extends Entity {
 		}
 		return diskSpaceInUse;
 	}
+	
+	public GlusterServer getServer(String serverName) {
+		for(GlusterServer server : servers) {
+			if (server.getName().equals(serverName)) {
+				return server;
+			}
+		}
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
index 7b6ee0fd..e54d2335 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
@@ -18,6 +18,8 @@
  *******************************************************************************/
 package com.gluster.storage.management.core.model;
 
+import java.io.File;
+
 import javax.xml.bind.annotation.XmlRootElement;
 
 import com.gluster.storage.management.core.utils.StringUtil;
@@ -114,7 +116,7 @@ public class Disk extends Entity {
 		return getServerName() + ":" + getName();
 	}
 	
-	public String getQualifiedBrickName() {
-		return getServerName() + ":" + getMountPoint();
+	public String getQualifiedBrickName(String volumeName) {
+		return getServerName() + ":" + getMountPoint() + File.separator + volumeName;
 	}
 }
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
index 1326e14c..cf12b0d7 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
@@ -235,8 +235,7 @@ public class Volume extends Entity {
 	
 	
 	public void setBricks(List<Brick> bricks) {
-		this.bricks.clear();
-		this.bricks.addAll(bricks);
+		this.bricks = bricks;
 	}
 	
 	public void removeBrick(Brick brick) {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java
index c18c53c0..c238cad7 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java
@@ -37,19 +37,10 @@ public class GlusterCoreUtil {
 		return qualifiedDiskNames;
 	}
 	
-	// Convert from Disk list to Qualified bricks list 
-	public static final List<String> getQualifiedBrickNames(List<Disk> diskList) {
-		List<String> qualifiedBrickNames = new ArrayList<String>();
-		for (Disk disk : diskList) {
-			qualifiedBrickNames.add(disk.getQualifiedBrickName());
-		}
-		return qualifiedBrickNames;
-	}
-	
-	public List<String> getQualifiedBrickList(List<Brick> bricks) {
+	public static final List<String> getQualifiedBrickList(List<Brick> bricks) {
 		List<String> qualifiedBricks = new ArrayList<String>();
 		for (Brick brick : bricks) {
-			qualifiedBricks.add(brick.getQualifiedBrickName());
+			qualifiedBricks.add(brick.getQualifiedName());
 		}
 		return qualifiedBricks;
 	}