Device mount point handling

Parameter changes for directory cleanup script.
Bug 3297 - Path seperator is appended as "\" instead of "/" if volume is created from windows client - fix

3 files changed, 13 insertions, 13 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 52978f2a..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
@@ -29,7 +29,7 @@ public class Brick extends Entity {
 	private String[] BRICK_STATUS_STR = {"Online", "Offline"};
 
 	private String serverName;
-	private String deviceName;
+	// private String deviceName;
 	private String brickDirectory;
 	private BRICK_STATUS status;
 
@@ -54,10 +54,10 @@ 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);
+		// setDeviceName(deviceName);
 		setBrickDirectory(brickDirectory);
 	}
 
@@ -77,20 +77,20 @@ public class Brick extends Entity {
 		return brickDirectory;
 	}
 
-	public void setDeviceName(String deviceName) {
-		this.deviceName = deviceName;
-	}
+//	public void setDeviceName(String deviceName) {
+//		this.deviceName = deviceName;
+//	}
 
-	public String getDeviceName() {
-		return deviceName;
-	}
+//	public String getDeviceName() {
+//		return deviceName;
+//	}
 
 	public String getQualifiedName() {
 		return serverName + ":" + brickDirectory;
 	}
 
 	public boolean filter(String filterString, boolean caseSensitive) {
-		return StringUtil.filterString(getServerName() + getBrickDirectory() + getDeviceName() + getStatusStr(), filterString,
+		return StringUtil.filterString(getServerName() + getBrickDirectory() + getStatusStr(), filterString,
 				caseSensitive);
 	}
 	
@@ -116,7 +116,7 @@ public class Brick extends Entity {
 	public void copyFrom(Brick newBrick) {
 		setServerName(newBrick.getServerName());
 		setBrickDirectory(newBrick.getBrickDirectory());
-		setDeviceName(newBrick.getDeviceName());
+		// setDeviceName(newBrick.getDeviceName());
 		setStatus(newBrick.getStatus());
 	}
 }
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.core/src/com/gluster/storage/management/core/model/Device.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
index 3f3c3810..08092e7e 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
@@ -180,7 +180,7 @@ public class Device extends Entity {
 	}
 	
 	public String getQualifiedBrickName(String volumeName) {
-		return getServerName() + ":" + getMountPoint() + File.separator + volumeName;
+		return getServerName() + ":" + getMountPoint() + "/" + volumeName;
 	}
 	
 	@Override