Changes to link UI with back-end for listing discovered and added servers

Signed-off-by: Shireesh Anjal <shireesh@gluster.com>

2 files changed, 14 insertions, 19 deletions

diff --git a/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java b/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
index 70356b82..c192a52c 100644
--- a/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
+++ b/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
@@ -96,7 +96,6 @@ public class GlusterDataModelManager {
 		initializeVolumes(cluster);
 		initializeAutoDiscoveredServers(cluster);
 		initializeDisks();
-		addDisksToServers();
 		addDisksToVolumes();
 		addVolumeOptions();
 
@@ -203,14 +202,7 @@ public class GlusterDataModelManager {
 	}
 
 	private void initializeGlusterServers(Cluster cluster) {
-		List<GlusterServer> servers = new ArrayList<GlusterServer>();
-		server1 = addGlusterServer(servers, cluster, "Server1", SERVER_STATUS.ONLINE, "eth0", 4, 56.3, 16, 8.4);
-		server2 = addGlusterServer(servers, cluster, "Server2", SERVER_STATUS.ONLINE, "eth1", 8, 41.92, 32, 18.76);
-		server3 = addGlusterServer(servers, cluster, "Server3", SERVER_STATUS.OFFLINE, "eth0", -1, -1, -1, -1);
-		server4 = addGlusterServer(servers, cluster, "Server4", SERVER_STATUS.ONLINE, "eth0", 1, 92.83, 4, 3.18);
-		server5 = addGlusterServer(servers, cluster, "Server5", SERVER_STATUS.ONLINE, "inf0", 2, 87.24, 8, 7.23);
-
-		cluster.setServers(servers);
+		cluster.setServers(new GlusterServersClient("localhost", "gluster", "gluster").getServers());
 	}
 
 	private void initializeAutoDiscoveredServers(Cluster cluster) {
diff --git a/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java b/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java
index 74da2a25..58858aa4 100644
--- a/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java
+++ b/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java
@@ -21,8 +21,9 @@ package com.gluster.storage.management.client;
 import java.util.List;
 
 import com.gluster.storage.management.core.model.GenericResponse;
+import com.gluster.storage.management.core.model.GlusterServer;
+import com.gluster.storage.management.core.model.GlusterServerListResponse;
 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.sun.jersey.api.representation.Form;
 
@@ -38,9 +39,9 @@ public class GlusterServersClient extends AbstractClient {
 		return RESOURCE_NAME;
 	}
 
-	public List<Server> getServers() {
-		@SuppressWarnings("unchecked")
-		ServerListResponse<Server> response = (ServerListResponse<Server>) fetchResource(ServerListResponse.class);
+	@SuppressWarnings("unchecked")
+	public List<GlusterServer> getServers() {
+		GlusterServerListResponse response = (GlusterServerListResponse) fetchResource(GlusterServerListResponse.class);
 		return response.getServers();
 	}
 
@@ -64,13 +65,15 @@ public class GlusterServersClient extends AbstractClient {
 
 	public static void main(String[] args) {
 		GlusterServersClient ServerResource = new GlusterServersClient("localhost", "gluster", "gluster");
-		List<Server> glusterServers = ServerResource.getServers();
-		System.out.println(glusterServers.size());
+		List<GlusterServer> glusterServers = ServerResource.getServers();
+		for(GlusterServer server : glusterServers) {
+			System.out.println(server.getName());
+		}
 
 		// Add server
-		Server srv = new Server();
-		srv.setName("my-server");
-		Status response = ServerResource.addServer(srv);
-		System.out.println(response.toString());
+//		Server srv = new Server();
+//		srv.setName("my-server");
+//		Status response = ServerResource.addServer(srv);
+//		System.out.println(response.toString());
 	}
 }