Remove disk comment fixes

2 files changed, 17 insertions, 8 deletions

diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
index 4fc70202..fe03fffd 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
@@ -173,10 +173,15 @@ public class VolumesResource {
 	@Path("{" + PATH_PARAM_VOLUME_NAME + "}")
 	@Produces(MediaType.TEXT_XML)
 	public Status deleteVolume(@QueryParam(QUERY_PARAM_VOLUME_NAME) String volumeName,
-			@QueryParam(QUERY_PARAM_DELETE_OPTION) String deleteOption) {
+			@QueryParam(QUERY_PARAM_DELETE_OPTION) boolean deleteFlag) {
 		Volume volume = glusterUtil.getVolume(volumeName);
 		Status status = glusterUtil.deleteVolume(volumeName);
-
+		
+		String deleteOption = "";
+		if(deleteFlag) {
+			deleteOption = "-d";
+		}
+		
 		if (status.isSuccess()) {
 			List<String> disks = volume.getDisks();
 			Status postDeleteStatus = postDelete(volumeName, disks, deleteOption);
@@ -193,16 +198,21 @@ public class VolumesResource {
 	@Path("{" + QUERY_PARAM_VOLUME_NAME + "}/" + SUBRESOURCE_DISKS)
 	@Produces(MediaType.TEXT_XML)
 	public Status removeBricks(@PathParam(QUERY_PARAM_VOLUME_NAME) String volumeName,
-			@QueryParam(QUERY_PARAM_DISKS) String disks, @QueryParam(QUERY_PARAM_DELETE_OPTION) String deleteOption) {
+			@QueryParam(QUERY_PARAM_DISKS) String disks, @QueryParam(QUERY_PARAM_DELETE_OPTION) boolean deleteFlag) {
 		List<String> bricks = Arrays.asList(disks.split(",")); // Convert from comma separated string (query parameter)
-		List<String> volumeBrick = new ArrayList<String>();
+		List<String> volumeBricks = new ArrayList<String>();
 		for (String brickInfo : bricks) {
 			String diskInfo[] = brickInfo.split(":");
-			volumeBrick.add(getBrickForDisk(getVolume(volumeName), diskInfo[1]));
+			volumeBricks.add(getBrickForDisk(getVolume(volumeName), diskInfo[1]));
 		}
 
-		Status status = glusterUtil.removeBricks(volumeName, volumeBrick);
+		Status status = glusterUtil.removeBricks(volumeName, volumeBricks);
 
+		String deleteOption = "";
+		if(deleteFlag) {
+			deleteOption = "-d";
+		}
+		
 		if (status.isSuccess()) {
 			Status cleanupStatus = cleanupDirectories(bricks, volumeName, bricks.size(), deleteOption);
 			if (!cleanupStatus.isSuccess()) {
@@ -569,7 +579,7 @@ public class VolumesResource {
 		Form form = new Form();
 		form.add("volumeName", volume.getName());
 		form.add(RESTConstants.FORM_PARAM_DELETE_OPTION, 1);
-		Status status = vr.deleteVolume("Vol2", "1");
+		Status status = vr.deleteVolume("Vol2", true);
 		System.out.println("Code : " + status.getCode());
 		System.out.println("Message " + status.getMessage());
 	}
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
index fa49a529..476b5a14 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
@@ -184,7 +184,6 @@ public class GlusterUtil {
 		List<String> command = prepareVolumeCreateCommand(volume, bricks, count, volumeType, transportTypeStr);
 		ProcessResult result = processUtil.executeCommand(command);
 		if (!result.isSuccess()) {
-			// Perform cleanup on all nodes before returning
 			return new Status(result);
 		}