Merge pull request #182 from Dhandapani/master

Bug 3290 - GUI throws 500 error if we try to add server with IP address or server name in small case

2 files changed, 24 insertions, 24 deletions

diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
index e6e4f9d6..3578dd31 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
@@ -211,7 +211,7 @@ public class GlusterServersResource extends AbstractResource {
 				throw new GlusterRuntimeException("No online server found in cluster [" + clusterName + "]");
 			}
 
-			glusterUtil.addServer(serverName, onlineServer.getName());
+			glusterUtil.addServer(onlineServer.getName(), serverName);
 		}
 	}
 
@@ -244,11 +244,7 @@ public class GlusterServersResource extends AbstractResource {
 		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, hostName);
-			} catch (Exception e) {
-				return errorResponse(e.getMessage());
-			}
+			performAddServer(clusterName, hostName);
 		} else {
 			// this is the first server to be added to the cluster, which means no
 			// gluster CLI operation required. just add it to the cluster-server mapping
@@ -256,26 +252,26 @@ public class GlusterServersResource extends AbstractResource {
 
 		try {
 			// add the cluster-server mapping
-			clusterService.mapServerToCluster(clusterName, serverName);
+			clusterService.mapServerToCluster(clusterName, hostName);
 		} catch (Exception e) {
 			return errorResponse(e.getMessage());
 		}
 
 		// since the server is added to a cluster, it should not more be considered as a
 		// discovered server available to other clusters
-		discoveredServersResource.removeDiscoveredServer(serverName);
+		discoveredServersResource.removeDiscoveredServer(hostName);
 
 		if (!publicKeyInstalled) {
 			try {
 				// install public key (this will also disable password based ssh login)
-				sshUtil.installPublicKey(serverName);
+				sshUtil.installPublicKey(hostName);
 			} catch (Exception e) {
-				return errorResponse("Public key could not be installed on [" + serverName + "]! Error: ["
+				return errorResponse("Public key could not be installed on [" + hostName + "]! Error: ["
 						+ e.getMessage() + "]");
 			}
 		}
 
-		return createdResponse(serverName);
+		return createdResponse(hostName);
 	}
 
 	@DELETE
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 443b1853..50733fea 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
@@ -528,23 +528,27 @@ public class GlusterUtil {
 			}
 		}
 		
-		// TODO: Execute the python script to find whether the volume is cifs enabled or not 
-		boolean isCifsEnabled = false;
-		List<String> cifsUsers = new ArrayList<String>();
-		if(isCifsEnabled) {
-			volume.enableCifs();
-			volume.setCifsUsers(cifsUsers);
-		} else {
-			volume.disableCifs();
-		}
-
-		if (volume != null) {// Adding the last volume parsed
-			volumes.add(volume);
-		}
+		updateCifsInfo(volumes);
 
 		return volumes;
 	}
 
+	private void updateCifsInfo(List<Volume> volumes) {
+		for (Volume volume : volumes) {
+			boolean isCifsEnabled = false;
+			
+			// TODO: Call python script to check if CIFS is enabled on the volume
+			
+			List<String> cifsUsers = new ArrayList<String>();
+			if (isCifsEnabled) {
+				volume.enableCifs();
+				volume.setCifsUsers(cifsUsers);
+			} else {
+				volume.disableCifs();
+			}
+		}
+	}
+
 	public void addBricks(String volumeName, List<String> bricks, String knownServer) {
 		StringBuilder command = new StringBuilder("gluster volume add-brick " + volumeName);
 		for (String brickDir : bricks) {