Merge branch 'master' of git@github.com:gluster/console

2 files changed, 21 insertions, 4 deletions

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
index 7566850a..98071128 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
@@ -84,6 +84,7 @@ public class GlusterDataModelManager {
 	public void initializeModelWithNewCluster(String securityToken, String clusterName) {
 		model = new GlusterDataModel("Gluster Data Model");
 		setSecurityToken(securityToken);
+		setClusterName(clusterName);
 
 		Cluster cluster = new Cluster(clusterName, model);
 
@@ -290,6 +291,15 @@ public class GlusterDataModelManager {
 			listener.serverAdded(server);
 		}
 	}
+	
+	public void addDiscoveredServer(Server server) {
+		Cluster cluster = model.getCluster();
+		cluster.addDiscoveredServer(server);
+		
+		for (ClusterListener listener : listeners) {
+			listener.discoveredServerAdded(server);;
+		}
+	}
 
 	public void removeDiscoveredServer(Server server) {
 		Cluster cluster = model.getCluster();
@@ -299,6 +309,15 @@ public class GlusterDataModelManager {
 			listener.discoveredServerRemoved(server);
 		}
 	}
+	
+	public void removeGlusterServer(GlusterServer server) {
+		Cluster cluster = model.getCluster();
+		cluster.removeServer(server);
+		
+		for (ClusterListener listener : listeners) {
+			listener.serverRemoved(server);
+		}
+	}
 
 	public void deleteVolume(Volume volume) {
 		Cluster cluster = model.getCluster();
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java
index f5609584..6c75b7c5 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java
@@ -70,14 +70,12 @@ public class GlusterServersClient extends AbstractClient {
 
 	public GlusterServerResponse addServer(Server discoveredServer) {
 		Form form = new Form();
-		form.add("serverName", discoveredServer.getName());
+		form.add(RESTConstants.FORM_PARAM_SERVER_NAME, discoveredServer.getName());
 		return (GlusterServerResponse)postRequest(GlusterServerResponse.class, form);
 	}
 	
 	public Status removeServer(String serverName) {
-		MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl();
-		queryParams.add(RESTConstants.QUERY_PARAM_SERVER_NAME, serverName);
-		return (Status) deleteResource(Status.class, queryParams);
+		return (Status) deleteSubResource(serverName,  Status.class);
 	}
 
 	public static void main(String[] args) {