Merge branch 'expand-volume'

Conflicts:
	src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
	src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
	src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java
	src/com.gluster.storage.management.gui/plugin.xml
	src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddDiskAction.java
	src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskPage.java
	src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskWizard.java
	src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
	src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java

13 files changed, 249 insertions, 137 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 b37c880c..87e02e28 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,14 +20,22 @@
  */
 package com.gluster.storage.management.client;
 
+
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.ws.rs.core.MultivaluedMap;
 
 import com.gluster.storage.management.core.constants.RESTConstants;
+import com.gluster.storage.management.core.model.Disk;
+import com.gluster.storage.management.core.model.Disk.DISK_STATUS;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.response.LogMessageListResponse;
 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;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
@@ -88,6 +96,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 Status addDisks(String volumeName, String disks) {
 		Form form = new Form();
@@ -108,27 +123,32 @@ public class VolumesClient extends AbstractClient {
 		UsersClient usersClient = new UsersClient();
 		if (usersClient.authenticate("gluster", "gluster").isSuccess()) {
 			VolumesClient client = new VolumesClient(usersClient.getSecurityToken());
-			// List<Disk> disks = new ArrayList<Disk>();
-			// Disk diskElement = new Disk();
-			// diskElement.setName("sda1");
-			// diskElement.setStatus(DISK_STATUS.READY);
-			// disks.add(diskElement);
-			// diskElement.setName("sda2");
-			// diskElement.setStatus(DISK_STATUS.READY);
-			// disks.add(diskElement);
-			//
-			// Volume vol = new Volume("vol1", null, Volume.VOLUME_TYPE.PLAIN_DISTRIBUTE,
-			// Volume.TRANSPORT_TYPE.ETHERNET,
-			// Volume.VOLUME_STATUS.ONLINE);
-			// // vol.setDisks(disks);
-			// System.out.println(client.createVolume(vol));
-			// 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());
-
-			Status status = client.addDisks("Volume3", "server1:sda, server1:sdb, server1:sdc");
+//			List<Disk> disks = new ArrayList<Disk>();
+//			Disk diskElement = new Disk();
+//			diskElement.setName("sda1");
+//			diskElement.setStatus(DISK_STATUS.READY);
+//			disks.add(diskElement);
+//			diskElement.setName("sda2");
+//			diskElement.setStatus(DISK_STATUS.READY);
+//			disks.add(diskElement);
+//
+//			Volume vol = new Volume("vol1", null, Volume.VOLUME_TYPE.PLAIN_DISTRIBUTE, Volume.TRANSPORT_TYPE.ETHERNET,
+//					Volume.VOLUME_STATUS.ONLINE);
+//			// vol.setDisks(disks);
+//			System.out.println(client.createVolume(vol));
+//			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());
+			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());
 		}
 	}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
index 99b76ed7..41ed5a25 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
@@ -51,8 +51,8 @@ public class Volume extends Entity {
 
 	
 	public static final int DEFAULT_REPLICA_COUNT = 2;
-	public static final int DEFAULT_STRIPE_COUNT = 2;
-	
+	public static final int DEFAULT_STRIPE_COUNT = 4;
+
 	public static final String OPTION_AUTH_ALLOW = "auth.allow";
 
 	private static final String[] VOLUME_TYPE_STR = new String[] { "Plain Distribute", "Distributed Mirror",
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java
new file mode 100644
index 00000000..9e3084fb
--- /dev/null
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java
@@ -0,0 +1,38 @@
+/**
+ * GlusterCoreUtil.java
+ *
+ * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Gluster Management Console is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+package com.gluster.storage.management.core.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.gluster.storage.management.core.model.Disk;
+
+
+public class GlusterCoreUtil {
+	// Convert from Disk list to Qualified disk name list 
+	public static final List<String> getQualifiedDiskNames(List<Disk> diskList) {
+		List<String> qualifiedDiskNames = new ArrayList<String>();
+		for (Disk disk : diskList) {
+			qualifiedDiskNames.add(disk.getQualifiedName());
+		}
+		return qualifiedDiskNames;
+	}
+}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java
index aed9c80c..8dc5837d 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java
@@ -32,12 +32,10 @@ public class StringUtil {
 
 	public static String ListToString(List<String> list, String delimiter) {
 		StringBuilder output = new StringBuilder();
-		for (int i = 0; i < list.size(); i++) {
-			output.append(list.get(i));
-			if (i < (list.size()-1) ) {
-				output.append(delimiter);
-			}
+		for(String element : list) {
+			output.append(element).append(delimiter);
 		}
-		return output.toString();
+		String outputStr = output.toString();
+		return outputStr.substring(0, outputStr.length() - (delimiter.length()+1));
 	}
 }
diff --git a/src/com.gluster.storage.management.gui/plugin.xml b/src/com.gluster.storage.management.gui/plugin.xml
index 8004b47e..21dbbf50 100644
--- a/src/com.gluster.storage.management.gui/plugin.xml
+++ b/src/com.gluster.storage.management.gui/plugin.xml
@@ -497,6 +497,11 @@
                style="push"
                toolbarPath="Normal"
                tooltip="Migrate Disk">
+               <enablement>
+                   <objectClass
+                         name="com.gluster.storage.management.core.model.Disk">
+                   </objectClass>
+               </enablement>
          </action>
          <action
                allowLabelUpdate="false"
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddDiskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddDiskAction.java
index befa3e37..cc57c541 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddDiskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddDiskAction.java
@@ -1,3 +1,24 @@
+/**
+ * AddDiskAction.java
+ *
+ * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Gluster Management Console is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
 package com.gluster.storage.management.gui.actions;
 
 import org.eclipse.jface.action.IAction;
@@ -32,8 +53,7 @@ public class AddDiskAction extends AbstractActionDelegate {
 			
 			@Override
 			public void run() {
-				AddDiskWizard wizard = new AddDiskWizard();
-				wizard.addPages(volume);
+				AddDiskWizard wizard = new AddDiskWizard(volume); // Also add single page
 				
 				WizardDialog dialog = new WizardDialog(getShell(), wizard);
 		        dialog.create();
@@ -41,7 +61,6 @@ public class AddDiskAction extends AbstractActionDelegate {
 		        dialog.open();
 			}
 		});
-		
 	}
 	
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskPage.java
index f8046a13..7eb107c0 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskPage.java
@@ -31,6 +31,8 @@ import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.core.model.Disk;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import com.richclientgui.toolbox.duallists.DualListComposite.ListContentChangedListener;
+import com.richclientgui.toolbox.duallists.IRemovableContentProvider;
 
 /**
  * @author root
@@ -40,7 +42,8 @@ public class AddDiskPage extends WizardPage {
 	private List<Disk> availableDisks = new ArrayList<Disk>();
 	private List<Disk> selectedDisks = new ArrayList<Disk>();
 	private Volume volume = null;
-	private CreateVolumeDisksPage page = null;
+	private DisksSelectionPage page = null;
+
 
 	public static final String PAGE_NAME = "add.disk.volume.page";
 
@@ -59,29 +62,52 @@ public class AddDiskPage extends WizardPage {
 			description += "(Disk selection should be multiples of " + volume.getStripeCount() + ")";
 		}
 		setDescription(description);
-		
+
 		availableDisks = getAvailableDisks(volume);
+		
+		setPageComplete(false);
+		setErrorMessage("Please select disks to be added to the volume.");
 	}
 
+	
+	private boolean  isDiskUsed(Volume volume, Disk disk){
+		for (String volumeDisk : volume.getDisks()) { // expected form of volumeDisk is "server:diskName"
+			if ( disk.getQualifiedName().equals(volumeDisk)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
 	protected List<Disk> getAvailableDisks(Volume volume) {
 		List<Disk> availableDisks = new ArrayList<Disk>();
-		boolean isDiskAlreadyUsedInTheVolume = false;
 		for (Disk disk : GlusterDataModelManager.getInstance().getReadyDisksOfAllServers()) {
-			isDiskAlreadyUsedInTheVolume = false;
-			for (String volumeDisk : volume.getDisks()) { // volumeDisk of the form "server:diskName"
-				if (disk.getServerName().equals(volumeDisk.split(":")[0])
-						&& disk.getName().equals(volumeDisk.split(":")[1])) {
-					isDiskAlreadyUsedInTheVolume = true;
-					break;
-				}
-			}
-			if (!isDiskAlreadyUsedInTheVolume) {
+			if ( ! isDiskUsed(volume, disk) ) {
 				availableDisks.add(disk);
 			}
 		}
 		return availableDisks;
 	}
 
+
+	public List<Disk> getChosenDisks( ) {
+		return page.getChosenDisks();
+	}
+	
+	private boolean isValidDiskSelection(int diskCount) {
+		if ( diskCount == 0) {
+			return false;
+		}
+		switch (volume.getVolumeType()) {
+		case DISTRIBUTED_MIRROR:
+			return (diskCount % volume.getReplicaCount() == 0);
+		case DISTRIBUTED_STRIPE:
+			return (diskCount % volume.getStripeCount() == 0);
+		}
+		return true;
+	}
+
+
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -90,12 +116,50 @@ public class AddDiskPage extends WizardPage {
 	@Override
 	public void createControl(Composite parent) {
 		getShell().setText("Add Disk");
-		List<Disk> configuredDisks = new ArrayList<Disk>(); // or volume.getDisks();
-		page = new CreateVolumeDisksPage(parent, SWT.NONE, availableDisks, configuredDisks);
+		List<Disk> chosenDisks = new ArrayList<Disk>(); // or volume.getDisks();
+		
+		page = new DisksSelectionPage(parent, SWT.NONE, availableDisks, chosenDisks);
+		page.addDiskSelectionListener(new ListContentChangedListener<Disk>() {
+			@Override
+			public void listContentChanged(IRemovableContentProvider<Disk> contentProvider) {
+				List<Disk> newChosenDisks = page.getChosenDisks();
+				
+				// validate chosen disks
+				if(isValidDiskSelection(newChosenDisks.size())) {
+					clearError();
+				} else {
+					setError();
+				}
+			}
+		});
 		setControl(page);
 	}
 
-	public CreateVolumeDisksPage getDialogPage() {
+	private void setError() {
+		String errorMessage = null;
+		if ( volume.getVolumeType() == VOLUME_TYPE.PLAIN_DISTRIBUTE) {
+			errorMessage = "Please select at least one disk!";
+		} else if( volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_MIRROR) {
+			errorMessage = "Please select disks in multiples of " + volume.getReplicaCount();
+		} else {
+			errorMessage = "Please select disks in multiples of " + volume.getStripeCount();
+		}
+
+		setPageComplete(false);
+		setErrorMessage(errorMessage);
+	}
+
+	private void clearError() {
+		setErrorMessage(null);
+		setPageComplete(true);
+	}
+
+	public DisksSelectionPage getDialogPage() {
 		return this.page;
 	}
+	
+	public void setPageComplete() {
+		
+	}
+
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskWizard.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskWizard.java
index 5d096764..e9608e38 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskWizard.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskWizard.java
@@ -20,20 +20,19 @@
  */
 package com.gluster.storage.management.gui.dialogs;
 
-import java.util.ArrayList;
-import java.util.Arrays;
+
 import java.util.List;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Display;
+
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.client.VolumesClient;
 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.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.utils.StringUtil;
+import com.gluster.storage.management.core.utils.GlusterCoreUtil;
+
 
 /**
  *
@@ -42,37 +41,18 @@ public class AddDiskWizard extends Wizard {
 	private AddDiskPage page;
 	private Volume volume;
 
-	public AddDiskWizard() {
+
+	public AddDiskWizard(Volume volume) {
 		setWindowTitle("Gluster Management Console - Add disk");
 		setHelpAvailable(false); // TODO: Introduce wizard help
+		this.volume = volume;
 	}
 
-	public void addPages(Volume volume) {
-		this.volume = volume;
+	public void addPages() {
 		page = new AddDiskPage(volume);
 		addPage(page);
 	}
 
-	private String getDiskNames(List<Disk> disks) {
-		List<String> diskNames = new ArrayList<String>();
-		for (Disk disk : disks) {
-			diskNames.add(disk.getServerName() + ":" + disk.getName());
-		}
-		return StringUtil.ListToString(diskNames, ",");
-	}
-
-	private boolean isValidDiskSelection(int diskCount) {
-		switch (volume.getVolumeType()) {
-		case PLAIN_DISTRIBUTE:
-			return (diskCount > 0);
-		case DISTRIBUTED_MIRROR:
-			return (diskCount % volume.getReplicaCount() == 0 && diskCount > 0);
-		case DISTRIBUTED_STRIPE:
-			return (diskCount % volume.getStripeCount() == 0 && diskCount > 0);
-		}
-		return false;
-	}
-	
 
 	/*
 	 * (non-Javadoc)
@@ -81,37 +61,23 @@ public class AddDiskWizard extends Wizard {
 	 */
 	@Override
 	public boolean performFinish() {
-		List<Disk> disks = page.getDialogPage().getChosenDisks();
-		String selectedDisks = getDiskNames(disks);
-		List<String> diskList = Arrays.asList(selectedDisks.split(":"));
-		if (isValidDiskSelection(disks.size())) {
-			VolumesClient volumeClient = new VolumesClient(GlusterDataModelManager.getInstance().getSecurityToken());
-			try {
-				Status status = volumeClient.addDisks(volume.getName(), getDiskNames(disks));
-				if (!status.isSuccess()) {
-					MessageDialog.openError(getShell(), "Add disk failure", status.getMessage());
-					return status.isSuccess();
-				} else {
-					volume.addDisks(diskList);
-					MessageDialog.openInformation(getShell(), "Add Disk", status.getMessage());
-					return status.isSuccess();
-				}
-			} catch (Exception e) {
-				MessageDialog.openError(getShell(), "Add disk failure", e.getMessage());
-				return false;
-			}
-		} else {
-			String errorMessage = "";
-			if ( volume.getVolumeType() == VOLUME_TYPE.PLAIN_DISTRIBUTE) {
-				errorMessage = "Atleast one disk required to add";
-			} else if( volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_MIRROR) {
-				errorMessage = "Multiples of " + volume.getReplicaCount() + " disks are required to add";
+		List<Disk> disks = page.getChosenDisks();
+		VolumesClient volumeClient = new VolumesClient(GlusterDataModelManager.getInstance().getSecurityToken());
+		try {
+			Status status = volumeClient.addDisks(volume.getName(), disks);
+			if (!status.isSuccess()) {
+				MessageDialog.openError(getShell(), "Add disk(s) to Volume", status.getMessage());
+				return status.isSuccess();
 			} else {
-				errorMessage = "Multiples of " + volume.getStripeCount() + " disks are required to add";
+				volume.addDisks(GlusterCoreUtil.getQualifiedDiskNames(disks));
+				MessageDialog.openInformation(getShell(), "Add disk(s) to Volume", "Disk(s) are successfully added to "
+						+ volume.getName());
+				return status.isSuccess();
 			}
-			MessageDialog.openError(getShell(), "Add disk failure", errorMessage);
+		} catch (Exception e) {
+			MessageDialog.openError(getShell(), "Add disk(s) to Volume", e.getMessage());
+			return false;
 		}
-		return false;
 	}
 
 	/*
@@ -121,7 +87,6 @@ public class AddDiskWizard extends Wizard {
 	 */
 	@Override
 	public boolean canFinish() {
-		// TODO: Add logic to return true only when all validations are successful
-		return super.canFinish();
+		return super.canFinish() && page.isPageComplete();
 	}
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeDisksPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/DisksSelectionPage.java
index c78601d9..e50e81a7 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeDisksPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/DisksSelectionPage.java
@@ -19,7 +19,6 @@
 package com.gluster.storage.management.gui.dialogs;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -48,7 +47,7 @@ import com.richclientgui.toolbox.duallists.IRemovableContentProvider;
 import com.richclientgui.toolbox.duallists.RemovableContentProvider;
 import com.richclientgui.toolbox.duallists.TableColumnData;
 
-public class CreateVolumeDisksPage extends Composite {
+public class DisksSelectionPage extends Composite {
 	private enum DISK_TABLE_COLUMN_INDICES {
 		SERVER, DISK, SPACE, SPACE_USED
 	}
@@ -67,13 +66,17 @@ public class CreateVolumeDisksPage extends Composite {
 
 	private Button btnDown;
 
-	public CreateVolumeDisksPage(final Composite parent, int style, List<Disk> allDisks, List<Disk> selectedDisks) {
+	public DisksSelectionPage(final Composite parent, int style, List<Disk> allDisks, List<Disk> selectedDisks) {
 		super(parent, style);
 
 		createPage(allDisks, selectedDisks);
 
 		parent.layout();
 	}
+	
+	public void addDiskSelectionListener(ListContentChangedListener<Disk> listener) {
+		dualTableViewer.addChosenListChangedSelectionListener(listener);
+	}
 
 	private TableLabelProviderAdapter getDiskLabelProvider() {
 		return new TableLabelProviderAdapter() {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
index 134323b3..08a35357 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
@@ -24,7 +24,6 @@ import java.util.List;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osgi.framework.internal.core.Msg;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
@@ -33,13 +32,11 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 
-import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Volume;
 
 public class SelectDisksDialog extends Dialog {
 
-	private CreateVolumeDisksPage disksPage;
+	private DisksSelectionPage disksPage;
 	private List<Disk> allDisks;
 	private List<Disk> selectedDisks;
 
@@ -78,14 +75,12 @@ public class SelectDisksDialog extends Dialog {
 		Composite container = new Composite(parent, SWT.NONE);
 		GridLayout containerLayout = new GridLayout(2, false);
 		container.setLayout(containerLayout);
-		GridData containerLayoutData = new GridData(SWT.FILL, SWT.FILL, true,
-				true);
+		GridData containerLayoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
 		container.setLayoutData(containerLayoutData);
 
 		getShell().setText("Create Volume - Select Disks");
 
-		disksPage = new CreateVolumeDisksPage(container, SWT.NONE, allDisks,
-				selectedDisks);
+		disksPage = new DisksSelectionPage(container, SWT.NONE, allDisks, selectedDisks);
 
 		return container;
 	}
@@ -97,10 +92,8 @@ public class SelectDisksDialog extends Dialog {
 	 */
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-				true);
-		createButton(parent, IDialogConstants.CANCEL_ID,
-				IDialogConstants.CANCEL_LABEL, false);
+		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
+		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
 	}
 
 	/**
@@ -112,15 +105,14 @@ public class SelectDisksDialog extends Dialog {
 	}
 
 	@Override
-	protected void cancelPressed() {
+	protected void cancelPressed() { System.out.println("Test");
 		super.cancelPressed();
 	}
 
 	@Override
 	protected void okPressed() {
 		if (this.getSelectedDisks().size() == 0) {
-			MessageDialog.openError(getShell(), "Select Disk(s)",
-					"Please select atlease one disk");
+			MessageDialog.openError(getShell(), "Select Disk(s)", "Please select atlease one disk");
 		} else {
 			super.okPressed();
 		}
@@ -129,7 +121,7 @@ public class SelectDisksDialog extends Dialog {
 	public List<Disk> getSelectedDisks() {
 		return disksPage.getChosenDisks();
 	}
-	
+
 	public List<String> getSelectedBricks() {
 		return disksPage.getChosenBricks();
 	}
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 d3bdec8b..457776cc 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
@@ -226,7 +226,7 @@ public class VolumesResource {
 				status = new Status(e);
 			}
 			if (status.isSuccess()) {
-				String brickDir = status.getMessage().trim().replace(CoreConstants.NEWLINE, "");
+				String brickDir = status.getMessage().trim();
 				bricks.add(serverName + ":" + brickDir);
 			} else {
 				// Brick preparation failed. Cleanup directories already created and return failure status
@@ -330,7 +330,8 @@ public class VolumesResource {
 		Status status = createDirectories(diskList, volumeName);
 		if (status.isSuccess()) {
 			List<String> bricks = Arrays.asList(status.getMessage().split(" "));
-			status = glusterUtil.addDisks(volumeName, bricks);
+			status = glusterUtil.addBricks(volumeName, bricks);
+
 			if (!status.isSuccess()) {
 				Status cleanupStatus = cleanupDirectories(diskList, volumeName, diskList.size());
 				if (!cleanupStatus.isSuccess()) {
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 aaedb3d4..30f73595 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
@@ -54,7 +54,8 @@ public class GlusterUtil {
 	private static final String VOLUME_OPTIONS_RECONFIG_PFX = "Options Reconfigured";
 	private static final String VOLUME_OPTION_AUTH_ALLOW = "auth.allow:";
 	private static final String VOLUME_LOG_LOCATION_PFX = "log file location:";
-
+	private static final String VOLUME_TYPE_DISTRIBUTE = "Distribute";
+	private static final String VOLUME_TYPE_REPLICATE = "Replicate";
 	private static final ProcessUtil processUtil = new ProcessUtil();
 
 	/**
@@ -258,9 +259,9 @@ public class GlusterUtil {
 	private boolean readVolumeType(Volume volume, String line) {
 		String volumeType = extractToken(line, VOLUME_TYPE_PFX);
 		if (volumeType != null) {
-			if (volumeType.equals("Distribute")) {
+			if (volumeType.equals(VOLUME_TYPE_DISTRIBUTE)) {
 				volume.setVolumeType(VOLUME_TYPE.PLAIN_DISTRIBUTE);
-			} else if (volumeType.equals("Replicate")) {
+			} else if (volumeType.equals(VOLUME_TYPE_REPLICATE)) {
 				volume.setVolumeType(VOLUME_TYPE.DISTRIBUTED_MIRROR);
 				volume.setReplicaCount(Volume.DEFAULT_REPLICA_COUNT);
 			} else {
@@ -272,18 +273,18 @@ public class GlusterUtil {
 		return false;
 	}
 
-	private void readBrickPair(Volume volume, String line) {
+
+	private void readReplicaOrStripeCount(Volume volume, String line) {
 		if (extractToken(line, "x") != null) {
+			// expected formated of line is "Number of Bricks: 3 x 2 = 6"
 			int count = Integer.parseInt(line.split("x")[1].split("=")[0].trim());
 			if (volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_STRIPE) {
 				volume.setStripeCount(count);
 			} else if (volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_MIRROR) {
 				volume.setReplicaCount(count);
 				volume.setStripeCount(0);
-			} else {
-				volume.setStripeCount(0);
-				volume.setReplicaCount(0);
-			}
+			} 
+
 		}
 		return;
 	}
@@ -320,6 +321,7 @@ public class GlusterUtil {
 		return false;
 	}
 
+
 	private void detectAndAddDiskToVolume(Volume volume, String serverName, String brickDir) {
 		// brick directory should be of the form /export/<diskname>/volume-name
 		try {
@@ -338,6 +340,7 @@ public class GlusterUtil {
 		}
 	}
 
+
 	private boolean readBrickGroup(String line) {
 		return extractToken(line, VOLUME_BRICKS_GROUP_PFX) != null;
 	}
@@ -390,7 +393,7 @@ public class GlusterUtil {
 			if (readVolumeType(volume, line))
 				continue;
 			if (extractToken(line, VOLUME_NUMBER_OF_BRICKS) != null) {
-				readBrickPair(volume, line);
+				readReplicaOrStripeCount(volume, line);
 			}
 			if (readVolumeStatus(volume, line))
 				continue;
@@ -429,7 +432,8 @@ public class GlusterUtil {
 		return volumes;
 	}
 
-	public Status addDisks(String volumeName, List<String> bricks) {
+
+	public Status addBricks(String volumeName, List<String> bricks) {
 		List<String> command = new ArrayList<String>();
 		command.add("gluster");
 		command.add("volume");
@@ -439,6 +443,7 @@ public class GlusterUtil {
 		return new Status(processUtil.executeCommand(command));
 	}
 
+
 	public String getLogLocation(String volumeName, String brickName) {
 		ProcessResult result = new ProcessUtil().executeCommand("gluster", "volume", "log", "locate", volumeName,
 				brickName);
@@ -464,13 +469,14 @@ public class GlusterUtil {
 		return logFileName;
 	}
 
+
 	public static void main(String args[]) {
 		// List<String> names = new GlusterUtil().getGlusterServerNames();
 		// System.out.println(names);
 		List<String> disks = new ArrayList<String>();
 		disks.add("server1:sda");
 		disks.add("server1:sdb");
-		Status status = new GlusterUtil().addDisks("Volume3", disks);
+		Status status = new GlusterUtil().addBricks("Volume3", disks);
 		System.out.println(status);
 	}
 }