Story #18 Add disk, UI, REST client and REST Resource

2 files changed, 26 insertions, 2 deletions

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java
index eb6ef3a0..c7ea7507 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java
@@ -46,6 +46,7 @@ public class DiscoveredServersClient extends AbstractClient {
 		MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl();
 		queryParams.putSingle("details", getDetails.toString());
 
+		//System.out.println((String) fetchResource(queryParams, String.class));
 		return ((Response) fetchResource(queryParams, responseClass)).getData();
 	}
 
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
index 05b89306..aaba73a8 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
@@ -20,11 +20,18 @@
  */
 package com.gluster.storage.management.client;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.gluster.storage.management.core.constants.RESTConstants;
+import com.gluster.storage.management.core.model.Disk;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.Volume;
+import com.gluster.storage.management.core.model.Disk.DISK_STATUS;
 import com.gluster.storage.management.core.response.VolumeListResponse;
 import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
+import com.gluster.storage.management.core.utils.GlusterCoreUtil;
+import com.gluster.storage.management.core.utils.StringUtil;
 import com.sun.jersey.api.representation.Form;
 
 public class VolumesClient extends AbstractClient {
@@ -84,6 +91,13 @@ public class VolumesClient extends AbstractClient {
 		return ((VolumeOptionInfoListResponse) fetchSubResource(RESTConstants.SUBRESOURCE_DEFAULT_OPTIONS,
 				VolumeOptionInfoListResponse.class));
 	}
+	
+	public Status addDisks(String volumeName, List<Disk> diskList) {
+		String disks = StringUtil.ListToString( GlusterCoreUtil.getQualifiedDiskNames(diskList), ",");
+		Form form = new Form();
+		form.add(RESTConstants.QUERY_PARAM_DISKS, disks);
+		return (Status) postRequest(volumeName + "/" + RESTConstants.SUBRESOURCE_DISKS, Status.class, form);
+	}
 
 	public static void main(String[] args) {
 		UsersClient usersClient = new UsersClient();
@@ -105,8 +119,17 @@ public class VolumesClient extends AbstractClient {
 //			for (VolumeOptionInfo option : client.getVolumeOptionsDefaults()) {
 //				System.out.println(option.getName() + "-" + option.getDescription() + "-" + option.getDefaultValue());
 //			}
-			System.out.println(client.getVolume("Volume3").getOptions());
-			System.out.println(client.setVolumeOption("Volume3", "network.frame-timeout", "600").getMessage());
+//			System.out.println(client.getVolume("Volume3").getOptions());
+//			System.out.println(client.setVolumeOption("Volume3", "network.frame-timeout", "600").getMessage());
+			List<Disk> disks = new ArrayList<Disk>(); 
+			Disk disk = new Disk();
+			disk.setServerName("server1");
+			disk.setName("sda");
+			disk.setStatus(DISK_STATUS.READY);
+			disks.add(disk);
+			
+			Status status = client.addDisks("Volume3", disks);
+			System.out.println(status.getMessage());
 		}
 	}
 }