Audo discovery changes

4 files changed, 339 insertions, 17 deletions

diff --git a/com.gluster.storage.management.client/.classpath b/com.gluster.storage.management.client/.classpath
index bb63c982..b8f71a37 100644
--- a/com.gluster.storage.management.client/.classpath
+++ b/com.gluster.storage.management.client/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/jersey-1.5/jersey-client-1.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jersey-1.5/jersey-core-1.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jersey-1.5/jersey-client-1.5.jar" sourcepath="/data/downloads/sun/jersey/sources/jersey-client-1.5-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jersey-1.5/jersey-core-1.5.jar" sourcepath="/data/downloads/sun/jersey/sources/jersey-core-1.5-sources.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
diff --git a/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java b/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
index 2d022055..d3ae02dd 100644
--- a/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
+++ b/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
@@ -3,6 +3,7 @@ package com.gluster.storage.management.client;
 import java.net.URI;

 

 import javax.ws.rs.core.MediaType;

+import javax.ws.rs.core.MultivaluedMap;

 

 import com.gluster.storage.management.client.utils.ClientUtil;

 import com.sun.jersey.api.client.Client;

@@ -10,9 +11,11 @@ import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.api.client.config.DefaultClientConfig;

 import com.sun.jersey.api.representation.Form;

 import com.sun.jersey.core.util.Base64;

+import com.sun.jersey.core.util.MultivaluedMapImpl;

 

 public abstract class AbstractClient {

 	private static final String HTTP_HEADER_AUTH = "Authorization";

+	protected static final MultivaluedMap<String, String> NO_PARAMS = new MultivaluedMapImpl();

 

 	protected WebResource resource;

 	private String authHeader;

@@ -28,13 +31,29 @@ public abstract class AbstractClient {
 	 * 

 	 * @param res

 	 *            Resource to be fetched

+	 * @param queryParams Query parameters to be sent for the GET request

 	 * @param responseClass

 	 *            Expected class of the response

 	 * @return Object of responseClass received as a result of the GET request

 	 */

 	@SuppressWarnings({ "unchecked", "rawtypes" })

-	private Object fetchResource(WebResource res, Class responseClass) {

-		return res.header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.TEXT_XML).get(responseClass);

+	private Object fetchResource(WebResource res, MultivaluedMap<String, String> queryParams, Class responseClass) {

+		return res.queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.TEXT_XML)

+				.get(responseClass);

+	}

+

+	/**

+	 * Fetches the default resource (the one returned by {@link AbstractClient#getResourceName()}) by dispatching a GET

+	 * request on the resource

+	 * 

+	 * @param queryParams Query parameters to be sent for the GET request

+	 * @param responseClass

+	 *            Expected class of the response

+	 * @return Object of responseClass received as a result of the GET request

+	 */

+	@SuppressWarnings("rawtypes")

+	protected Object fetchResource(MultivaluedMap<String, String> queryParams, Class responseClass) {

+		return fetchResource(resource, queryParams, responseClass);

 	}

 

 	/**

@@ -47,7 +66,7 @@ public abstract class AbstractClient {
 	 */

 	@SuppressWarnings("rawtypes")

 	protected Object fetchResource(Class responseClass) {

-		return fetchResource(resource, responseClass);

+		return fetchResource(resource, NO_PARAMS, responseClass);

 	}

 

 	/**

@@ -62,7 +81,7 @@ public abstract class AbstractClient {
 	 */

 	@SuppressWarnings("rawtypes")

 	protected Object fetchSubResource(String subResourceName, Class responseClass) {

-		return fetchResource(resource.path(subResourceName), responseClass);

+		return fetchResource(resource.path(subResourceName), NO_PARAMS, responseClass);

 	}

 

 	protected Object postRequest(Class responseClass, Form form) {

diff --git a/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java b/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java
index 35008135..6d9ebdd6 100644
--- a/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java
+++ b/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java
@@ -20,9 +20,14 @@ package com.gluster.storage.management.client;
 
 import java.util.List;
 
+import javax.ws.rs.core.MultivaluedMap;
+
 import com.gluster.storage.management.core.model.GenericResponse;
+import com.gluster.storage.management.core.model.Response;
 import com.gluster.storage.management.core.model.Server;
 import com.gluster.storage.management.core.model.ServerListResponse;
+import com.gluster.storage.management.core.model.StringListResponse;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
 
 public class DiscoveredServersClient extends AbstractClient {
 	private static final String RESOURCE_NAME = "discoveredservers";
@@ -35,11 +40,25 @@ public class DiscoveredServersClient extends AbstractClient {
 	public String getResourceName() {
 		return RESOURCE_NAME;
 	}
+	
+	private Object getDiscoveredServers(Boolean getDetails, Class responseClass) {
+		MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl();
+		queryParams.putSingle("details", getDetails.toString());
+		
+		// TODO: Used during development to check the response contents.
+		// to be removed later
+		String response = (String) fetchResource(queryParams, String.class);
+		System.out.println(response);
 
-	public List<Server> getDiscoveredServers() {
-		@SuppressWarnings("unchecked")
-		ServerListResponse<Server> response = (ServerListResponse<Server>) fetchResource(ServerListResponse.class);
-		return response.getServers();
+		return ((Response) fetchResource(queryParams, responseClass)).getData();
+	}
+
+	public List<String> getDiscoveredServerNames() {
+		return (List<String>)getDiscoveredServers(Boolean.FALSE, StringListResponse.class);
+	}
+	
+	public List<Server> getDiscoveredServerDetails() {
+		return (List<Server>)getDiscoveredServers(Boolean.TRUE, ServerListResponse.class);
 	}
 
 	public Server getServer(String serverName) {
@@ -49,14 +68,12 @@ public class DiscoveredServersClient extends AbstractClient {
 		return response.getData();
 	}
 
-	public String getServerXML(String serverName) {
-		return ((String) fetchSubResource(serverName, String.class));
-	}
-
 	public static void main(String[] args) {
-		DiscoveredServersClient ServerResource = new DiscoveredServersClient("localhost", "gluster", "gluster");
-		List<Server> discoveredServers = ServerResource.getDiscoveredServers();
-		System.out.println(discoveredServers.size());
+		DiscoveredServersClient serverResource = new DiscoveredServersClient("localhost", "gluster", "gluster");
+		List<String> discoveredServerNames = serverResource.getDiscoveredServerNames();
+		System.out.println(discoveredServerNames);
+		List<Server> discoveredServers = serverResource.getDiscoveredServerDetails();
+		System.out.println(discoveredServers);
 
 		// Server serverDetails = ServerResource.getServer("localhost");
 		// System.out.println(serverDetails.getName());
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
new file mode 100644
index 00000000..70356b82
--- /dev/null
+++ b/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
@@ -0,0 +1,286 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *  
+ * Gluster Management Console is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+ * for more details.
+ *  
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+package com.gluster.storage.management.client;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import com.gluster.storage.management.core.model.Cluster;
+import com.gluster.storage.management.core.model.Disk;
+import com.gluster.storage.management.core.model.Entity;
+import com.gluster.storage.management.core.model.GlusterDataModel;
+import com.gluster.storage.management.core.model.GlusterServer;
+import com.gluster.storage.management.core.model.LogMessage;
+import com.gluster.storage.management.core.model.NetworkInterface;
+import com.gluster.storage.management.core.model.Server;
+import com.gluster.storage.management.core.model.Volume;
+import com.gluster.storage.management.core.model.Disk.DISK_STATUS;
+import com.gluster.storage.management.core.model.GlusterServer.SERVER_STATUS;
+import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
+import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+
+public class GlusterDataModelManager {
+	// private Server discoveredServer1, discoveredServer2, discoveredServer3, discoveredServer4, discoveredServer5;
+	private GlusterServer server1, server2, server3, server4, server5;
+	private Volume volume1, volume2, volume3, volume4, volume5;
+	private Disk s1da, s1db, s2da, s2db, s2dc, s2dd, s3da, s4da, s5da, s5db;
+	private static List<LogMessage> logMessages = new ArrayList<LogMessage>();
+	private static GlusterDataModelManager instance = new GlusterDataModelManager();
+	private GlusterDataModel model;
+
+	private GlusterDataModelManager() {
+		model = initializeModel();
+	}
+
+	public GlusterDataModel getModel() {
+		return model;
+	}
+
+	public static GlusterDataModelManager getInstance() {
+		return instance;
+	}
+
+	private GlusterServer addGlusterServer(List<GlusterServer> servers, Entity parent, String name,
+			SERVER_STATUS status, String preferredInterfaceName, int numOfCPUs, double cpuUsage, double totalMemory,
+			double memoryInUse) {
+		GlusterServer glusterServer = new GlusterServer(name, parent, status, numOfCPUs, cpuUsage, totalMemory,
+				memoryInUse);
+		NetworkInterface networkInterface = addNetworkInterface(glusterServer, preferredInterfaceName);
+		glusterServer.setPreferredNetworkInterface(networkInterface);
+
+		servers.add(glusterServer);
+		return glusterServer;
+	}
+
+	private NetworkInterface addNetworkInterface(Server server, String interfaceName) {
+		NetworkInterface networkInterface = new NetworkInterface(interfaceName, server, "192.168.1."
+				+ Math.round(Math.random() * 255), "255.255.255.0", "192.168.1.1");
+		server.setNetworkInterfaces(Arrays.asList(new NetworkInterface[] { networkInterface }));
+		return networkInterface;
+	}
+
+	private void addDiscoveredServer(List<Server> servers, Entity parent, String name, int numOfCPUs, double cpuUsage,
+			double totalMemory, double memoryInUse, double totalDiskSpace, double diskSpaceInUse) {
+		Server server = new Server(name, parent, numOfCPUs, cpuUsage, totalMemory, memoryInUse);
+		server.addDisk(new Disk(server, "sda", totalDiskSpace, diskSpaceInUse, DISK_STATUS.READY));
+		addNetworkInterface(server, "eth0");
+
+		servers.add(server);
+	}
+
+	private GlusterDataModel initializeModel() {
+		// Create the dummy data model for demo
+		GlusterDataModel model = new GlusterDataModel("Clusters");
+		Cluster cluster = new Cluster("Home", model);
+
+		initializeGlusterServers(cluster);
+		initializeVolumes(cluster);
+		initializeAutoDiscoveredServers(cluster);
+		initializeDisks();
+		addDisksToServers();
+		addDisksToVolumes();
+		addVolumeOptions();
+
+		createDummyLogMessages();
+
+		model.addCluster(cluster);
+		return model;
+	}
+
+	private void addVolumeOptions() {
+		for (Volume vol : new Volume[] { volume1, volume2, volume3, volume4, volume5 }) {
+			for (int i = 1; i <= 5; i++) {
+				String key = vol.getName() + "key" + i;
+				String value = vol.getName() + "value" + i;
+				vol.setOption(key, value);
+			}
+		}
+	}
+
+	private Volume addVolume(List<Volume> volumes, String name, Cluster cluster, VOLUME_TYPE volumeType,
+			TRANSPORT_TYPE transportType, VOLUME_STATUS status) {
+		Volume volume = new Volume(name, cluster, volumeType, transportType, status);
+		volumes.add(volume);
+
+		return volume;
+	}
+
+	private void initializeVolumes(Cluster cluster) {
+		List<Volume> volumes = new ArrayList<Volume>();
+
+		volume1 = addVolume(volumes, "Volume1", cluster, VOLUME_TYPE.PLAIN_DISTRIBUTE, TRANSPORT_TYPE.ETHERNET,
+				VOLUME_STATUS.ONLINE);
+
+		volume2 = addVolume(volumes, "Volume2", cluster, VOLUME_TYPE.PLAIN_DISTRIBUTE, TRANSPORT_TYPE.ETHERNET,
+				VOLUME_STATUS.ONLINE);
+
+		volume3 = addVolume(volumes, "Volume3", cluster, VOLUME_TYPE.DISTRIBUTED_MIRROR, TRANSPORT_TYPE.ETHERNET,
+				VOLUME_STATUS.OFFLINE);
+		volume3.setReplicaCount(2);
+
+		volume4 = addVolume(volumes, "Volume4", cluster, VOLUME_TYPE.PLAIN_DISTRIBUTE, TRANSPORT_TYPE.ETHERNET,
+				VOLUME_STATUS.ONLINE);
+
+		volume5 = addVolume(volumes, "Volume5", cluster, VOLUME_TYPE.DISTRIBUTED_STRIPE, TRANSPORT_TYPE.INFINIBAND,
+				VOLUME_STATUS.OFFLINE);
+		volume5.setStripeCount(3);
+
+		cluster.setVolumes(volumes);
+	}
+
+	private void initializeDisks() {
+		s1da = new Disk(server1, "sda", 100d, 80d, DISK_STATUS.READY);
+		s1db = new Disk(server1, "sdb", 100d, 67.83, DISK_STATUS.READY);
+
+		s2da = new Disk(server2, "sda", 200d, 157.12, DISK_STATUS.READY);
+		s2db = new Disk(server2, "sdb", 200d, 182.27, DISK_STATUS.READY);
+		s2dc = new Disk(server2, "sdc", 200d, -1d, DISK_STATUS.UNINITIALIZED);
+		s2dd = new Disk(server2, "sdd", 200d, 124.89, DISK_STATUS.READY);
+
+		s3da = new Disk(server3, "NA", -1d, -1d, DISK_STATUS.OFFLINE); // disk name unavailable since server is offline
+
+		s4da = new Disk(server4, "sda", 100d, 85.39, DISK_STATUS.READY);
+
+		s5da = new Disk(server5, "sda", 100d, 92.83, DISK_STATUS.READY);
+		s5db = new Disk(server5, "sdb", 200d, 185.69, DISK_STATUS.READY);
+	}
+
+	private void addDisksToServers() {
+		server1.addDisk(s1da);
+		server1.addDisk(s1db);
+
+		server2.addDisk(s2da);
+		server2.addDisk(s2db);
+		server2.addDisk(s2dc);
+		server2.addDisk(s2dd);
+
+		// server3.addDisk(s3da);
+
+		server4.addDisk(s4da);
+
+		server5.addDisk(s5da);
+		server5.addDisk(s5db);
+	}
+
+	private void addDisksToVolumes() {
+		volume1.addDisk(s1da);
+
+		volume2.addDisk(s2da);
+		volume2.addDisk(s1db);
+		volume2.addDisk(s3da);
+		volume2.addDisk(s4da);
+
+		volume3.addDisk(s2db);
+		volume3.addDisk(s4da);
+		volume3.addDisk(s5da);
+
+		volume4.addDisk(s1da);
+		volume4.addDisk(s3da);
+		volume4.addDisk(s4da);
+		volume4.addDisk(s5db);
+
+		volume5.addDisk(s2da);
+		volume5.addDisk(s5db);
+	}
+
+	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);
+	}
+
+	private void initializeAutoDiscoveredServers(Cluster cluster) {
+		cluster.setAutoDiscoveredServers(new DiscoveredServersClient("localhost", "gluster", "gluster")
+				.getDiscoveredServerDetails());
+	}
+
+	private void addMessages(List<LogMessage> messages, Disk disk, String severity, int count) {
+		for (int i = 1; i <= count; i++) {
+			String message = severity + "message" + i;
+			messages.add(new LogMessage(new Date(), disk, severity, message));
+		}
+	}
+
+	private void addMessagesForDisk(List<LogMessage> logMessages, Disk disk) {
+		addMessages(logMessages, disk, "SEVERE", 5);
+		addMessages(logMessages, disk, "WARNING", 5);
+		addMessages(logMessages, disk, "DEBUG", 5);
+		addMessages(logMessages, disk, "INFO", 5);
+	}
+
+	public List<LogMessage> createDummyLogMessages() {
+		addMessagesForDisk(logMessages, s1da);
+		addMessagesForDisk(logMessages, s1db);
+		addMessagesForDisk(logMessages, s2da);
+		addMessagesForDisk(logMessages, s2db);
+		addMessagesForDisk(logMessages, s2dc);
+		addMessagesForDisk(logMessages, s2dd);
+		addMessagesForDisk(logMessages, s4da);
+		addMessagesForDisk(logMessages, s5da);
+		addMessagesForDisk(logMessages, s5db);
+		return logMessages;
+	}
+
+	public static List<LogMessage> getDummyLogMessages() {
+		return logMessages;
+	}
+
+	public List<Disk> getReadyDisksOfVolume(Volume volume) {
+		List<Disk> disks = new ArrayList<Disk>();
+		for (Disk disk : volume.getDisks()) {
+			if (disk.isReady()) {
+				disks.add(disk);
+			}
+		}
+		return disks;
+	}
+
+	public List<Disk> getReadyDisksOfAllVolumes() {
+		List<Disk> disks = new ArrayList<Disk>();
+		for (Volume volume : ((Cluster) model.getChildren().get(0)).getVolumes()) {
+			disks.addAll(getReadyDisksOfVolume(volume));
+		}
+		return disks;
+	}
+
+	public List<Disk> getReadyDisksOfAllServers() {
+		return getReadyDisksOfAllServersExcluding(new ArrayList<Disk>());
+	}
+
+	public List<Disk> getReadyDisksOfAllServersExcluding(List<Disk> excludeDisks) {
+		List<Disk> disks = new ArrayList<Disk>();
+
+		for (Server server : ((Cluster) model.getChildren().get(0)).getServers()) {
+			for (Disk disk : server.getDisks()) {
+				if (disk.isReady() && !excludeDisks.contains(disk)) {
+					disks.add(disk);
+				}
+			}
+		}
+		return disks;
+	}
+}