Merge pull request #160 from Dhandapani/master

Bug 3267 - Serve name entered in different case than the actual name could cause side effects - Fix

3 files changed, 36 insertions, 20 deletions

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java
index 940d78cb..7778f9be 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java
@@ -49,24 +49,28 @@ public class AddServerAction extends AbstractActionDelegate {
 				String errMsg = "";
 				String partErrMsg = "";
 				
-				if(selectedServers.isEmpty()) {
+				if (selectedServers.isEmpty()) {
 					addServerManually();
-				}
-				for (Server server : selectedServers) {
-					guiHelper.setStatusMessage("Adding server [" + server.getName() + "]...");
+				} else {
+					for (Server server : selectedServers) {
+						guiHelper.setStatusMessage("Adding server [" + server.getName() + "]...");
 
-					try {
-						glusterServersClient.addServer(server.getName());
-						modelManager.addGlusterServer(glusterServersClient.getGlusterServer(server.getName()));
-						successServers.add(server);
-					} catch (Exception e) {
-						// TODO: Handle error conditions
+						try {
+							glusterServersClient.addServer(server.getName());
+							modelManager.addGlusterServer(glusterServersClient.getGlusterServer(server.getName()));
+							successServers.add(server);
+						} catch (Exception e) {
+							if (!errMsg.isEmpty()) {
+								errMsg += CoreConstants.NEWLINE;
+							}
+							errMsg += "Server " + server.getName() + ". Error: [" + e.getMessage() + "]";
+						}
 					}
-				}
 
-				guiHelper.clearStatusMessage();
-				showStatusMessage(action.getDescription(), selectedServers, successServers, partSuccessServers, errMsg,
-						partErrMsg);
+					guiHelper.clearStatusMessage();
+					showStatusMessage(action.getDescription(), selectedServers, successServers, partSuccessServers,
+							errMsg, partErrMsg);
+				}
 			}
 
 			private void addServerManually() {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java
index 9693ace9..525f4132 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java
@@ -334,11 +334,12 @@ public class GlusterServersResource extends AbstractServersResource {
 					+ "Please reset it back to the standard default password and try again.");
 		}
 
+		String hostName = serverUtil.fetchHostName(serverName);
 		List<ServerInfo> servers = cluster.getServers();
 		if (servers != null && !servers.isEmpty()) {
 			// cluster has at least one existing server, so that peer probe can be performed
 			try {
-				performAddServer(clusterName, serverName);
+				performAddServer(clusterName, hostName);
 			} catch (Exception e) {
 				return errorResponse(e.getMessage());
 			}
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/ServerUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/ServerUtil.java
index e4d37ad8..f0aab567 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/ServerUtil.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/ServerUtil.java
@@ -59,6 +59,7 @@ public class ServerUtil {
 	private static final String SCRIPT_DIR = "scripts";
 	private static final String SCRIPT_COMMAND = "python";
 	private static final String REMOTE_SCRIPT_GET_DISK_FOR_DIR = "get_disk_for_dir.py";
+	private static final String REMOTE_SCRIPT_GET_SERVER_DETAILS = "get_server_details.py";
 
 	public void setSshUtil(SshUtil sshUtil) {
 		this.sshUtil = sshUtil;
@@ -85,15 +86,25 @@ public class ServerUtil {
 	 *            Server whose details are to be fetched
 	 */
 	public void fetchServerDetails(Server server) {
-		// fetch standard server details like cpu, disk, memory details
-		Object response = executeOnServer(true, server.getName(), "get_server_details.py", Server.class);
-		if (response instanceof Status) {
-			throw new GlusterRuntimeException(((Status)response).getMessage());
-		}
+		Object response = fetchServerDetails(server.getName());
 		server.copyFrom((Server) response); // Update the details in <Server> object
 		server.setDisks(((Server) response).getDisks());
 	}
+	
+	public String fetchHostName(String serverName) {
+		Object response = fetchServerDetails(serverName);
+		return ((Server) response).getName();
+	}
 
+	private Object fetchServerDetails(String serverName) {
+		// fetch standard server details like cpu, disk, memory details
+		Object response = executeOnServer(true, serverName, REMOTE_SCRIPT_GET_SERVER_DETAILS, Server.class);
+		if (response instanceof Status) {
+			throw new GlusterRuntimeException(((Status) response).getMessage());
+		}
+		return response;
+	}
+	
 	/**
 	 * Executes given command on given server
 	 *