Modified to make sure that the server devices are updated with server name even in case of manual server addition.

3 files changed, 8 insertions, 5 deletions

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 c61c993c..2dd660bf 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
@@ -120,7 +120,9 @@ public class GlusterServersClient extends AbstractClient {
 		return fetchSubResource(RESTConstants.RESOURCE_STATISTICS, queryParams, ServerStats.class);
 	}
 	
-	public GlusterServer getServer(URI uri) {
-		return fetchResource(uri, GlusterServer.class);
+	public GlusterServer getGlusterServer(URI uri) {
+		GlusterServer server = fetchResource(uri, GlusterServer.class);
+		GlusterCoreUtil.updateServerNameOnDevices(server);
+		return server;
 	}
 }
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddServerAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddServerAction.java
index 6b47c6c2..0c371f05 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddServerAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddServerAction.java
@@ -18,6 +18,7 @@
  *******************************************************************************/
 package com.gluster.storage.management.console.actions;
 
+import java.net.URI;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -56,8 +57,8 @@ public class AddServerAction extends AbstractActionDelegate {
 						guiHelper.setStatusMessage("Adding server [" + server.getName() + "]...");
 
 						try {
-							glusterServersClient.addServer(server.getName());
-							modelManager.addGlusterServer(glusterServersClient.getGlusterServer(server.getName()));
+							URI newServerURI = glusterServersClient.addServer(server.getName());
+							modelManager.addGlusterServer(glusterServersClient.getGlusterServer(newServerURI));
 							successServers.add(server);
 						} catch (Exception e) {
 							if (!errMsg.isEmpty()) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ServerAdditionDialog.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ServerAdditionDialog.java
index e02d42a4..9781f348 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ServerAdditionDialog.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ServerAdditionDialog.java
@@ -184,7 +184,7 @@ public class ServerAdditionDialog extends Dialog {
 			String serverNameText = serverName.getText();
 			URI newServerURI = serversClient.addServer(serverNameText);
 
-			modelManager.addGlusterServer(serversClient.getServer(newServerURI));
+			modelManager.addGlusterServer(serversClient.getGlusterServer(newServerURI));
 
 			MessageDialog
 					.openInformation(getShell(), "Add Server", "Server " + serverNameText + " added successfully!");