From a468e753ba0c437bf4fb1bf4250cd1d0e175a08b Mon Sep 17 00:00:00 2001
From: Shireesh Anjal <shireesh@gluster.com>
Date: Wed, 1 Jun 2011 21:01:28 +0530
Subject: Design changes - introducing cluster-server mapping on gateway

---
 .../gluster/storage/management/server/resources/ClustersResource.java  | 3 +--
 .../storage/management/server/resources/GlusterServersResource.java    | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java
index 11a77e87..c5f2da69 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java
@@ -120,8 +120,7 @@ public class ClustersResource {
 			List<GlusterServer> glusterServers = glusterUtil.getGlusterServers(server);
 			List<ServerInfo> servers = new ArrayList<ServerInfo>();
 			for(GlusterServer glusterServer : glusterServers) {
-				ServerInfo serverInfo = new ServerInfo();
-				serverInfo.setName(glusterServer.getName());
+				ServerInfo serverInfo = new ServerInfo(glusterServer.getName());
 				serverInfo.setCluster(cluster);
 				servers.add(serverInfo);
 			}
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java
index be6c326a..b364db29 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java
@@ -220,6 +220,7 @@ public class GlusterServersResource extends AbstractServersResource {
 							+ "]: [" + e.getMessage() + "]"), null);
 		}
 
+		// TODO: Install ssh key on new server
 		return getGlusterServer(clusterName, serverName);
 	}
 
@@ -253,6 +254,8 @@ public class GlusterServersResource extends AbstractServersResource {
 			}
 			return glusterUtil.removeServer(onlineServer.getName(), serverName);
 		}
+		
+		// TODO: Remove the server from cluster-server mapping
 	}
 
 	private void setGlusterUtil(GlusterUtil glusterUtil) {
-- 
cgit