Merge pull request #7 from Selvasundaram/master

Disk Initialization enhanced with user selectable file system and mount point 

1 files changed, 10 insertions, 1 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 3d27afb2..5fefedc0 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
@@ -30,7 +30,9 @@ import javax.ws.rs.core.MultivaluedMap;
 import com.gluster.storage.management.core.constants.RESTConstants;
 import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.model.ServerStats;
+import com.gluster.storage.management.core.response.FsTypeListResponse;
 import com.gluster.storage.management.core.response.GlusterServerListResponse;
+import com.gluster.storage.management.core.response.StringListResponse;
 import com.gluster.storage.management.core.utils.GlusterCoreUtil;
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
@@ -76,9 +78,16 @@ public class GlusterServersClient extends AbstractClient {
 		return postRequest(form);
 	}
 	
-	public URI initializeDisk(String serverName, String diskName, String fsType) {
+	public List<String> getFSTypes(String serverName) {
+		FsTypeListResponse fsTypeListResponse = ((FsTypeListResponse) fetchSubResource(serverName + "/" + RESTConstants.RESOURCE_FSTYPES,
+				FsTypeListResponse.class));
+		return fsTypeListResponse.getFsTypes();
+	}
+
+	public URI initializeDisk(String serverName, String diskName, String fsType, String mountPoint) {
 		Form form = new Form();
 		form.add(RESTConstants.FORM_PARAM_FSTYPE, fsType);
+		form.add(RESTConstants.FORM_PARAM_MOUNTPOINT, fsType);
 		return putRequestURI(serverName + "/" + RESTConstants.RESOURCE_DISKS + "/" + diskName, form);
 	}