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

6 files changed, 143 insertions, 95 deletions

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();
 	}