Merge branch 'volumes'

Conflicts:
	src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
	src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java
	src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
	src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java

7 files changed, 8 insertions, 10 deletions

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 5c60b1a0..0b8ad6fd 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
@@ -54,7 +54,7 @@ public class Brick extends Entity {
 		this.status = status;
 	}
 
-	public Brick(String serverName, BRICK_STATUS brickStatus, String deviceName, String brickDirectory) {
+	public Brick(String serverName, BRICK_STATUS brickStatus, String brickDirectory) {
 		setServerName(serverName);
 		setStatus(brickStatus);
 		// setDeviceName(deviceName);
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 67aeeeda..e11199f6 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
@@ -162,7 +162,7 @@ public class Cluster extends Entity {
 	
 	public GlusterServer getServer(String serverName) {
 		for(GlusterServer server : servers) {
-			if (server.getName().equalsIgnoreCase(serverName)) {
+			if (server.getName().equalsIgnoreCase(serverName) || server.getIpAddressesAsString().contains(serverName)) {
 				return server;
 			}
 		}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
index 54f723e9..5db3926b 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
@@ -416,7 +416,7 @@ public class GlusterUtil {
 //		if (Pattern.matches(stdBrickDirPattern, brickDir) ) {
 //			deviceName = brickDir.split("/")[2].trim();
 //		}
-		volume.addBrick(new Brick(serverName, status, deviceName, brickDir));
+		volume.addBrick(new Brick(serverName, status, brickDir));
 	}
 	
 	// Do not throw exception, Gracefully handle as Offline brick. 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java
index 175d24ea..11226e8a 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java
@@ -76,7 +76,6 @@ public class BrickTableLabelProvider extends TableLabelProviderAdapter {
 
 		Brick brick = (Brick) element;
 		Device device = GlusterDataModelManager.getInstance().getDeviceForBrickDir(brick);
-System.out.println(device.getServerName() + device.getName());
 		return (columnIndex == BRICK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? brick.getServerName()
 				: columnIndex == BRICK_TABLE_COLUMN_INDICES.BRICK.ordinal() ? brick.getBrickDirectory()
 				: columnIndex == BRICK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? getDeviceFreeSpace(device)
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
index 5c7fb5c2..1e4e8135 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
@@ -593,7 +593,7 @@ public class GlusterDataModelManager {
 	public Device getDeviceForBrickDir(Brick brick) {
 		Device brickDevice = null;
 		for (Device device :   getReadyDevicesOfServer(brick.getServerName(), new ArrayList<Device>())) {
-			if (brick.getBrickDirectory().matches("^" + device.getMountPoint() + ".*")) {
+			if (brick.getBrickDirectory().startsWith( device.getMountPoint() )) {
 				if (brickDevice == null || device.getMountPoint().length() > brickDevice.getMountPoint().length()) {
 					brickDevice = device;
 				}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
index e0dae4fd..04678da9 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
@@ -323,9 +323,8 @@ public class BricksSelectionPage extends Composite {
 		if (bricksArr != null) {
 			Set<Brick> bricks = new HashSet<Brick>();
 			for (Object device : bricksArr) {
-				bricks.add(new Brick(((Device) device).getServerName(), BRICK_STATUS.ONLINE, ((Device) device).getName(),
-						((Device) device).getMountPoint() + "/" + volumeName)); // Assumption mount point is not having
-																			// trailing "/"
+				bricks.add(new Brick(((Device) device).getServerName(), BRICK_STATUS.ONLINE, ((Device) device)
+						.getMountPoint() + "/" + volumeName)); // Assumption mount point is not having trailing "/" 
 			}
 			return bricks;
 		}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
index c0e76889..57cc1266 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
@@ -338,8 +338,8 @@ public class CreateVolumePage1 extends WizardPage {
 		}
 		
 		for (Device device : selectedDevices) {
-			Brick brick = new Brick(device.getServerName(), BRICK_STATUS.ONLINE, device.getName(),
-					device.getMountPoint() + "/" + volume.getName()); 
+			Brick brick = new Brick(device.getServerName(), BRICK_STATUS.ONLINE, device.getMountPoint() + "/"
+					+ volume.getName());
 			volume.addBrick(brick);
 		}