auto-discovery

1 files changed, 17 insertions, 10 deletions

diff --git a/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/DiscoveredServersResource.java b/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/DiscoveredServersResource.java
index f3809ebd..3bd6866e 100644
--- a/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/DiscoveredServersResource.java
+++ b/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/DiscoveredServersResource.java
@@ -18,7 +18,9 @@
  *******************************************************************************/
 package com.gluster.storage.management.server.resources;
 
+import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.ws.rs.GET;
@@ -33,6 +35,7 @@ import com.gluster.storage.management.client.DiscoveredServersClient;
 import com.gluster.storage.management.core.model.Server;
 import com.gluster.storage.management.core.model.ServerListResponse;
 import com.gluster.storage.management.core.model.Status;
+import com.gluster.storage.management.core.utils.FileUtil;
 import com.gluster.storage.management.core.utils.ProcessResult;
 import com.gluster.storage.management.core.utils.ProcessUtil;
 import com.sun.jersey.spi.resource.Singleton;
@@ -45,23 +48,21 @@ public class DiscoveredServersResource {
 
 	// TODO: xml should be read from a "work" directory under the tomcat server.
 	// Use relative path - do not hard code the absolute path.
-	public static final String DISCOVERED_SERVERS_XML = "/GLUSTER/discovered-servers.xml";
+	public static final String DISCOVERED_SERVERS = "/GLUSTER/discovered-server-names";
 
 	private List<String> getDiscoveredServerNames() {
-		// TODO: Run required python script get list of discovered servers and return the same
-		return null;
+		File discoveredServersFile = new File(DISCOVERED_SERVERS);
+		String serverNames = new FileUtil().readFileAsString(discoveredServersFile);
+        String[] parts = serverNames.split("\n");
+        return Arrays.asList(parts);
 	}
 
 	@GET

 	@Produces(MediaType.TEXT_XML)

 	public ServerListResponse<Server> getDiscoveredServers() {
-//		File discoveredServersFile = new File(DISCOVERED_SERVERS_XML);
-//		String serverNames = new FileUtil().readFileAsString(discoveredServersFile);
-		
 		ServerListResponse<Server> response = new ServerListResponse<Server>();
 		response.setServers(getDiscoveredServerDetails());
 		response.setStatus(Status.STATUS_SUCCESS);
-		
 		return response;
 	}
 
@@ -69,8 +70,8 @@ public class DiscoveredServersResource {
 		List<Server> discoveredServers = new ArrayList<Server>();
 		List<String> serverNames = getDiscoveredServerNames();
 		for(String serverName : serverNames) {
-			DiscoveredServersClient client = new DiscoveredServersClient();
-			Server server = client.getServer(serverName);
+			DiscoveredServersClient client = new DiscoveredServersClient(serverName);
+			Server server = client.getServer("me");
 			discoveredServers.add(server);
 		}
 		return discoveredServers;
@@ -91,7 +92,7 @@ public class DiscoveredServersResource {
 		}
 		
 		// Fetch details of given server by sending a REST request to that server
-		return new DiscoveredServersClient().getServerXML(serverName);
+		return new DiscoveredServersClient(serverName).getServerXML("me");
 	}
 	
 	public String getThisServer() {
@@ -102,4 +103,10 @@ public class DiscoveredServersResource {
 		return result.getOutput();
 	}
 
+	public static void main(String[] args) {
+		ServerListResponse<Server> listResponse = new DiscoveredServersResource().getDiscoveredServers();
+		for (Server server : listResponse.getServers()) {
+			System.out.println(server.getName());
+		}
+	}
 }