Merge branch 'disk-to-brick'

21 files changed, 588 insertions, 212 deletions

diff --git a/src/com.gluster.storage.management.gui/plugin.xml b/src/com.gluster.storage.management.gui/plugin.xml
index 4b0de509..82b7f3e0 100644
--- a/src/com.gluster.storage.management.gui/plugin.xml
+++ b/src/com.gluster.storage.management.gui/plugin.xml
@@ -106,10 +106,10 @@
       <view
             allowMultiple="false"
             category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.VolumeDisksView"
+            class="com.gluster.storage.management.gui.views.VolumeBricksView"
             icon="icons/disks.png"
-            id="com.gluster.storage.management.gui.views.VolumeDisksView"
-            name="Disks (Volume)"
+            id="com.gluster.storage.management.gui.views.VolumeBricksView"
+            name="Bricks"
             restorable="true">
       </view>
       <view
@@ -247,20 +247,20 @@
       </command>
       <command
             categoryId="com.gluster.storage.management.gui.category"
-            description="Migrate Disk"
+            description="Migrate Brick"
             id="com.gluster.storage.management.gui.commands.MigrateDisk"
-            name="Migrate Disk">
+            name="Migrate Brick">
       </command>
       <command
             categoryId="com.gluster.storage.management.gui.category"
-            description="Remove Disk"
+            description="Remove Brick"
             id="com.gluster.storage.management.gui.commands.RemoveDisk"
-            name="Remove Disk">
+            name="Remove Brick">
       </command>
       <command
-            description="Add Disk"
+            description="Add Brick"
             id="com.gluster.storage.management.gui.commands.AddDisk"
-            name="Add Disk">
+            name="Add Brick">
       </command>
    </extension>
    <extension
@@ -493,7 +493,7 @@
                definitionId="com.gluster.storage.management.gui.commands.MigrateDisk"
                icon="icons/disk-migrate.png"
                id="com.gluster.storage.management.gui.actions.MigrateDiskAction"
-               label="&amp;Migrate Disk"
+               label="&amp;Migrate Brick"
                menubarPath="com.gluster.storage.management.gui.menu.glusterserver/glusterserver"
                mode="FORCE_TEXT"
                pulldown="false"
@@ -610,7 +610,7 @@
                definitionId="com.gluster.storage.management.gui.commands.RemoveDisk"
                icon="icons/disk.png"
                id="com.gluster.storage.management.gui.actions.RemoveDiskAction"
-               label="Remove Disk"
+               label="Remove Brick"
                menubarPath="com.gluster.storage.management.gui.menu.volume/volume"
                mode="FORCE_TEXT"
                pulldown="false"
@@ -618,7 +618,7 @@
                state="false"
                style="push"
                toolbarPath="Normal"
-               tooltip="Remove Disk from Volume">
+               tooltip="Remove Brick from Volume">
          </action>
          <action
                allowLabelUpdate="false"
@@ -626,7 +626,7 @@
                definitionId="com.gluster.storage.management.gui.commands.AddDisk"
                icon="icons/disk.png"
                id="com.gluster.storage.management.gui.actions.AddDiskAction"
-               label="&amp;Add Disk"
+               label="&amp;Add Brick"
                menubarPath="com.gluster.storage.management.gui.menu.volume/volume"
                mode="FORCE_TEXT"
                pulldown="false"
@@ -634,7 +634,7 @@
                state="false"
                style="push"
                toolbarPath="Normal"
-               tooltip="Add Disk to Volume">
+               tooltip="Add Brick to Volume">
          </action>
          <menu
                id="com.gluster.storage.management.gui.menu.volume"
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java
new file mode 100644
index 00000000..deaea17c
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * 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;
+
+import org.eclipse.swt.graphics.Image;
+
+import com.gluster.storage.management.client.GlusterDataModelManager;
+import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import com.gluster.storage.management.core.model.Brick;
+import com.gluster.storage.management.core.model.Disk;
+import com.gluster.storage.management.core.model.Disk.DISK_STATUS;
+import com.gluster.storage.management.core.utils.NumberUtil;
+import com.gluster.storage.management.gui.utils.GUIHelper;
+import com.gluster.storage.management.gui.views.details.BricksPage.BRICK_TABLE_COLUMN_INDICES;
+import com.gluster.storage.management.gui.views.details.DisksPage.DISK_TABLE_COLUMN_INDICES;
+
+public class BrickTableLabelProvider extends TableLabelProviderAdapter {
+	private GUIHelper guiHelper = GUIHelper.getInstance();
+
+	@Override
+	public Image getColumnImage(Object element, int columnIndex) {
+		
+		if (!(element instanceof Brick)) {
+			return null;
+		}
+
+		Brick brick = (Brick) element;
+		Disk disk = GlusterDataModelManager.getInstance().getDiskDetails(brick.getDiskName());
+		
+		if (columnIndex == DISK_TABLE_COLUMN_INDICES.STATUS.ordinal()) {
+			DISK_STATUS status = disk.getStatus();
+			switch (status) {
+			case READY:
+				return guiHelper.getImage(IImageKeys.STATUS_ONLINE);
+			case OFFLINE:
+				return guiHelper.getImage(IImageKeys.STATUS_OFFLINE);
+			default:
+				throw new GlusterRuntimeException("Invalid brick status [" + status + "]");
+			}
+		}
+
+		return null;
+	}
+
+	private String getDiskSpaceInUse(Disk disk) {
+		if (disk.isReady()) {
+			return NumberUtil.formatNumber(disk.getSpaceInUse());
+		} else {
+			return "NA";
+		}
+	}
+
+	private String getDiskSpace(Disk disk) {
+		if (disk.isOffline()) {
+			return "NA";
+		} else {
+			return NumberUtil.formatNumber(disk.getSpace());
+		}
+	}
+
+	@Override
+	public String getColumnText(Object element, int columnIndex) {
+		if (!(element instanceof Brick)) {
+			return null;
+		}
+
+		Brick brick = (Brick) element;
+		Disk disk = GlusterDataModelManager.getInstance().getDiskDetails(brick.getDiskName());
+		
+		return (columnIndex == BRICK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? brick.getServerName()
+				: columnIndex == BRICK_TABLE_COLUMN_INDICES.BRICK.ordinal() ? brick.getBrickDirectory()
+				: columnIndex == BRICK_TABLE_COLUMN_INDICES.SPACE.ordinal() ? getDiskSpace(disk)
+				: columnIndex == BRICK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal() ? getDiskSpaceInUse(disk)
+				: columnIndex == BRICK_TABLE_COLUMN_INDICES.STATUS.ordinal() ? brick.getStatusStr() : "Invalid");
+	}
+}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java
index 92553797..51c1f707 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java
@@ -20,7 +20,9 @@ package com.gluster.storage.management.gui;
 
 import org.eclipse.swt.graphics.Image;
 
+import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Disk;
 import com.gluster.storage.management.core.model.Disk.DISK_STATUS;
 import com.gluster.storage.management.core.utils.NumberUtil;
@@ -32,11 +34,14 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter {
 
 	@Override
 	public Image getColumnImage(Object element, int columnIndex) {
-		if (!(element instanceof Disk)) {
+		
+		if (!(element instanceof Brick)) {
 			return null;
 		}
 
-		Disk disk = (Disk) element;
+		Brick brick = (Brick) element;
+		Disk disk = GlusterDataModelManager.getInstance().getDisk(brick.getDiskName());
+		
 		if (columnIndex == DISK_TABLE_COLUMN_INDICES.STATUS.ordinal()) {
 			DISK_STATUS status = disk.getStatus();
 			switch (status) {
@@ -74,13 +79,15 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter {
 
 	@Override
 	public String getColumnText(Object element, int columnIndex) {
-		if (!(element instanceof Disk)) {
+		if (!(element instanceof Brick)) {
 			return null;
 		}
 
-		Disk disk = (Disk) element;
-		return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServerName()
-				: columnIndex == DISK_TABLE_COLUMN_INDICES.DISK.ordinal() ? disk.getName()
+		Brick brick = (Brick) element;
+		Disk disk = GlusterDataModelManager.getInstance().getDisk(brick.getDiskName());
+		
+		return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? brick.getServerName()
+				: columnIndex == DISK_TABLE_COLUMN_INDICES.DISK.ordinal() ? brick.getBrickDirectory()
 				: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE.ordinal() ? getDiskSpace(disk)
 				: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal() ? getDiskSpaceInUse(disk)
 				: columnIndex == DISK_TABLE_COLUMN_INDICES.STATUS.ordinal() ? disk.getStatusStr() : "Invalid");
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/MigrateDiskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/MigrateDiskAction.java
index 04ee39fb..bbb29253 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/MigrateDiskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/MigrateDiskAction.java
@@ -23,20 +23,20 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
 
-import com.gluster.storage.management.core.model.Disk;
+import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.gui.dialogs.MigrateDiskWizard;
 
 public class MigrateDiskAction extends AbstractActionDelegate {
 	private Volume volume;
-	private Disk disk;
+	private Brick brick;
 
 	@Override
 	protected void performAction(IAction action) {
 //		MigrateDiskDialog dialog = new MigrateDiskDialog(window.getShell(), volume, disk);
 // 		dialog.create();
 // 		dialog.open();
-		MigrateDiskWizard wizard = new MigrateDiskWizard(volume, disk);
+		MigrateDiskWizard wizard = new MigrateDiskWizard(volume, brick);
 
 		WizardDialog dialog = new WizardDialog(window.getShell(), wizard);
 		dialog.create();
@@ -53,8 +53,8 @@ public class MigrateDiskAction extends AbstractActionDelegate {
 		}
 
 		action.setEnabled(false);
-		if (selectedEntity instanceof Disk) {
-			disk = (Disk) selectedEntity;
+		if (selectedEntity instanceof Brick) {
+			brick = (Brick) selectedEntity;
 			action.setEnabled(((StructuredSelection) selection).size() == 1);
 		}
 	}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java
index 47ef9e73..5372f986 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java
@@ -8,49 +8,58 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchPart;
 
 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.Brick;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.Volume;
+import com.gluster.storage.management.core.utils.StringUtil;
 import com.gluster.storage.management.gui.IImageKeys;
 import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.VolumeDisksView;
+import com.gluster.storage.management.gui.views.VolumeBricksView;
+
 
 public class RemoveDiskAction extends AbstractActionDelegate {
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
 	private GUIHelper guiHelper = GUIHelper.getInstance();
-	private List<Disk> disks;
+	private List<Brick> bricks;
 	private Volume volume;
+	boolean confirmDelete = false;
 
 	@Override
 	protected void performAction(IAction action) {
 		final String actionDesc = action.getDescription();
-		Integer deleteOption = new MessageDialog(getShell(), "Remove Disk(s)", GUIHelper.getInstance().getImage(
-				IImageKeys.VOLUME), "Are you sure you want to remove disks from volume [" + volume.getName()
-				+ "] ?", MessageDialog.QUESTION, new String[] { "Cancel", "Remove disks, delete data",
-				"Remove disks, keep data" }, 2).open();
+		List<String> brickList = getBrickList(bricks);
+		Integer deleteOption = new MessageDialog(getShell(), "Remove Bricks(s)", GUIHelper.getInstance().getImage(
+				IImageKeys.VOLUME), "Are you sure you want to remove following bricks from volume [" + volume.getName()
+				+ "] ? \n" + StringUtil.ListToString(brickList, ", "), MessageDialog.QUESTION, new String[] { "Cancel", "Remove bricks, delete data",
+				"Remove bricks, keep data" }, 2).open();
 		if (deleteOption <= 0) { // By Cancel button(0) or Escape key(-1)
 			return;
 		}
 
-		boolean confirmDelete = false;
 		if (deleteOption == 1) {
 			confirmDelete = true;
 		}
+		BusyIndicator.showWhile(Display.getDefault(), new Runnable() {
+			public void run() {
+				VolumesClient client = new VolumesClient(modelManager.getSecurityToken());
+				Status status = client.removeBricks(volume.getName(), bricks, confirmDelete);
 
-		VolumesClient client = new VolumesClient(modelManager.getSecurityToken());
-		Status status = client.removeBricks(volume.getName(), disks, confirmDelete);
-
-		if (status.isSuccess()) {
-			showInfoDialog(actionDesc, "Volume [" + volume.getName() + "] disk(s) removed successfully!");
-			modelManager.deleteVolume(volume);
-		} else {
-			showErrorDialog(actionDesc, "Volume [" + volume.getName() + "] disk(s) could not be removed! Error: ["
-					+ status + "]");
-		}
+				if (status.isSuccess()) {
+					showInfoDialog(actionDesc, "Volume [" + volume.getName() + "] bricks(s) removed successfully!");
+					modelManager.deleteVolume(volume);
+				} else {
+					showErrorDialog(actionDesc, "Volume [" + volume.getName() + "] bricks(s) could not be removed! Error: ["
+							+ status + "]");
+				}
+			}
+		});
+		
 	}
 
 	@Override
@@ -66,26 +75,34 @@ public class RemoveDiskAction extends AbstractActionDelegate {
 		if (volume != null) {
 			// a volume is selected on navigation tree. Let's check if the currently open view is volume disks view
 			IWorkbenchPart view = guiHelper.getActiveView();
-			if(view instanceof VolumeDisksView) {
-				// volume disks view is open. check if any disk is selected
-				disks = getSelectedDisks(selection);
-				action.setEnabled(disks.size() > 0);
+			if(view instanceof VolumeBricksView) {
+				// volume disks view is open. check if any brick is selected
+				bricks = getSelectedBricks(selection);
+				action.setEnabled(bricks.size() > 0);
 			}
 		}
 	}
 
-	private List<Disk> getSelectedDisks(ISelection selection) {
-		List<Disk> selectedDisks = new ArrayList<Disk>();
+	private List<Brick> getSelectedBricks(ISelection selection) {
+		List<Brick> selectedBricks = new ArrayList<Brick>();
 		
 		if (selection instanceof IStructuredSelection) {
 			Iterator<Object> iter = ((IStructuredSelection) selection).iterator();
 			while (iter.hasNext()) {
 				Object selectedObj = iter.next();
-				if (selectedObj instanceof Disk) {
-					selectedDisks.add((Disk)selectedObj);
+				if (selectedObj instanceof Brick) {
+					selectedBricks.add((Brick)selectedObj);
 				}
 			}
 		}
-		return selectedDisks;
+		return selectedBricks;
+	}
+	
+	private List<String> getBrickList(List<Brick> bricks) {
+		List<String> brickList = new ArrayList<String>();
+		for(Brick brick : bricks) {
+			brickList.add(brick.getServerName() + ":" + brick.getBrickDirectory());
+		}
+		return brickList;
 	}
 }
\ No newline at end of file
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 7eb107c0..48a46c84 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
@@ -28,6 +28,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 
 import com.gluster.storage.management.client.GlusterDataModelManager;
+import com.gluster.storage.management.core.model.Brick;
 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;
@@ -42,7 +43,7 @@ public class AddDiskPage extends WizardPage {
 	private List<Disk> availableDisks = new ArrayList<Disk>();
 	private List<Disk> selectedDisks = new ArrayList<Disk>();
 	private Volume volume = null;
-	private DisksSelectionPage page = null;
+	private BricksSelectionPage page = null;
 
 
 	public static final String PAGE_NAME = "add.disk.volume.page";
@@ -53,26 +54,26 @@ public class AddDiskPage extends WizardPage {
 	protected AddDiskPage(Volume volume) {
 		super(PAGE_NAME);
 		this.volume = volume;
-		setTitle("Add Disk");
+		setTitle("Add Brick");
 
-		String description = "Add disks to the Volume by choosing disks from the cluster servers.\n";
+		String description = "Add bricks to [" + volume.getName() + "] ";
 		if ( volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_MIRROR) {
-			description += "(Disk selection should be multiples of " + volume.getReplicaCount() + ")";
+			description += "(in multiples of " + volume.getReplicaCount() + ")";
 		} else if (volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_STRIPE) {
-			description += "(Disk selection should be multiples of " + volume.getStripeCount() + ")";
+			description += "(in multiples of " + volume.getStripeCount() + ")";
 		}
 		setDescription(description);
 
 		availableDisks = getAvailableDisks(volume);
 		
 		setPageComplete(false);
-		setErrorMessage("Please select disks to be added to the volume.");
+		setErrorMessage("Please select bricks to be added to the volume [" + volume.getName()  +"]");
 	}
 
 	
 	private boolean  isDiskUsed(Volume volume, Disk disk){
-		for (String volumeDisk : volume.getDisks()) { // expected form of volumeDisk is "server:diskName"
-			if ( disk.getQualifiedName().equals(volumeDisk)) {
+		for (Brick volumeBrick : volume.getBricks()) { // expected form of volumeBrick is "server:/export/diskName/volumeName"
+			if ( disk.getQualifiedBrickName(volume.getName()).equals(volumeBrick.getQualifiedName())) {
 				return true;
 			}
 		}
@@ -94,6 +95,10 @@ public class AddDiskPage extends WizardPage {
 		return page.getChosenDisks();
 	}
 	
+	public List<Brick> getChosenBricks( String volumeName ) {
+		return page.getChosenBricks(volumeName);
+	}
+	
 	private boolean isValidDiskSelection(int diskCount) {
 		if ( diskCount == 0) {
 			return false;
@@ -115,10 +120,10 @@ public class AddDiskPage extends WizardPage {
 	 */
 	@Override
 	public void createControl(Composite parent) {
-		getShell().setText("Add Disk");
+		getShell().setText("Add Brick");
 		List<Disk> chosenDisks = new ArrayList<Disk>(); // or volume.getDisks();
 		
-		page = new DisksSelectionPage(parent, SWT.NONE, availableDisks, chosenDisks);
+		page = new BricksSelectionPage(parent, SWT.NONE, availableDisks, chosenDisks, volume.getName());
 		page.addDiskSelectionListener(new ListContentChangedListener<Disk>() {
 			@Override
 			public void listContentChanged(IRemovableContentProvider<Disk> contentProvider) {
@@ -138,11 +143,11 @@ public class AddDiskPage extends WizardPage {
 	private void setError() {
 		String errorMessage = null;
 		if ( volume.getVolumeType() == VOLUME_TYPE.PLAIN_DISTRIBUTE) {
-			errorMessage = "Please select at least one disk!";
+			errorMessage = "Please select at least one brick!";
 		} else if( volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_MIRROR) {
-			errorMessage = "Please select disks in multiples of " + volume.getReplicaCount();
+			errorMessage = "Please select bricks in multiples of " + volume.getReplicaCount();
 		} else {
-			errorMessage = "Please select disks in multiples of " + volume.getStripeCount();
+			errorMessage = "Please select bricks in multiples of " + volume.getStripeCount();
 		}
 
 		setPageComplete(false);
@@ -154,7 +159,7 @@ public class AddDiskPage extends WizardPage {
 		setPageComplete(true);
 	}
 
-	public DisksSelectionPage getDialogPage() {
+	public BricksSelectionPage getDialogPage() {
 		return this.page;
 	}
 	
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 e9608e38..069ed730 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,7 +20,7 @@
  */
 package com.gluster.storage.management.gui.dialogs;
 
-
+import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -28,11 +28,12 @@ import org.eclipse.jface.wizard.Wizard;
 
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.client.VolumesClient;
+import com.gluster.storage.management.core.model.Brick;
 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.utils.GlusterCoreUtil;
-
+import com.gluster.storage.management.core.utils.StringUtil;
 
 /**
  *
@@ -41,9 +42,8 @@ public class AddDiskWizard extends Wizard {
 	private AddDiskPage page;
 	private Volume volume;
 
-
 	public AddDiskWizard(Volume volume) {
-		setWindowTitle("Gluster Management Console - Add disk");
+		setWindowTitle("Gluster Management Console - Add Brick");
 		setHelpAvailable(false); // TODO: Introduce wizard help
 		this.volume = volume;
 	}
@@ -53,7 +53,6 @@ public class AddDiskWizard extends Wizard {
 		addPage(page);
 	}
 
-
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -61,25 +60,36 @@ public class AddDiskWizard extends Wizard {
 	 */
 	@Override
 	public boolean performFinish() {
-		List<Disk> disks = page.getChosenDisks();
+		List<Brick> bricks = page.getChosenBricks(volume.getName());
 		VolumesClient volumeClient = new VolumesClient(GlusterDataModelManager.getInstance().getSecurityToken());
 		try {
-			Status status = volumeClient.addDisks(volume.getName(), disks);
+			List<String> brickList = getBrickList(bricks);
+			Status status = volumeClient.addBricks(volume.getName(), brickList);
 			if (!status.isSuccess()) {
-				MessageDialog.openError(getShell(), "Add disk(s) to Volume", status.getMessage());
+				MessageDialog.openError(getShell(), "Add brick(s) to Volume", status.getMessage());
 				return status.isSuccess();
 			} else {
+				List<Disk> disks = page.getChosenDisks();
 				volume.addDisks(GlusterCoreUtil.getQualifiedDiskNames(disks));
-				MessageDialog.openInformation(getShell(), "Add disk(s) to Volume", "Disk(s) are successfully added to "
-						+ volume.getName());
+				volume.addBricks(bricks);
+				MessageDialog.openInformation(getShell(), "Add brick(s) to Volume", "Volume [" + volume.getName()
+						+ "] is expanded with bricks [" + StringUtil.ListToString(brickList, ", ") + "]");
 				return status.isSuccess();
 			}
 		} catch (Exception e) {
-			MessageDialog.openError(getShell(), "Add disk(s) to Volume", e.getMessage());
+			MessageDialog.openError(getShell(), "Add brick(s) to Volume", e.getMessage());
 			return false;
 		}
 	}
 
+	private List<String> getBrickList(List<Brick> bricks) {
+		List<String> brickList = new ArrayList<String>();
+		for(Brick brick : bricks) {
+			brickList.add(brick.getServerName() + ":" + brick.getBrickDirectory());
+		}
+		return brickList;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/DisksSelectionPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
index e50e81a7..b5a89939 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/DisksSelectionPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
@@ -35,6 +35,8 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
 
+import com.gluster.storage.management.core.model.Brick;
+import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
 import com.gluster.storage.management.core.model.Disk;
 import com.gluster.storage.management.core.utils.NumberUtil;
 import com.gluster.storage.management.gui.IImageKeys;
@@ -47,12 +49,12 @@ import com.richclientgui.toolbox.duallists.IRemovableContentProvider;
 import com.richclientgui.toolbox.duallists.RemovableContentProvider;
 import com.richclientgui.toolbox.duallists.TableColumnData;
 
-public class DisksSelectionPage extends Composite {
+public class BricksSelectionPage extends Composite {
 	private enum DISK_TABLE_COLUMN_INDICES {
-		SERVER, DISK, SPACE, SPACE_USED
+		SERVER, BRICK_DIRECTORY, SPACE, SPACE_USED
 	}
 
-	private static final String[] DISK_TABLE_COLUMNS_NAMES = { "Server", "Disk", "Space (GB)", "Used Space (GB)" };
+	private static final String[] DISK_TABLE_COLUMNS_NAMES = { "Server", "Brick Directory", "Space (GB)", "Used Space (GB)" };
 
 	private GUIHelper guiHelper = GUIHelper.getInstance();
 	private CustomTableDualListComposite<Disk> dualTableViewer;
@@ -60,16 +62,16 @@ public class DisksSelectionPage extends Composite {
 	// This list keeps track of the order of the disks as user changes the same by clicking on up/down arrow buttons
 	private List<Disk> chosenDisks = new ArrayList<Disk>();
 
-	private IRemovableContentProvider<Disk> chosenDisksContentProvider;
+	private IRemovableContentProvider<Disk> chosenBricksContentProvider;
 
 	private Button btnUp;
 
 	private Button btnDown;
 
-	public DisksSelectionPage(final Composite parent, int style, List<Disk> allDisks, List<Disk> selectedDisks) {
+	public BricksSelectionPage(final Composite parent, int style, List<Disk> allDisks, List<Disk> selectedDisks, String volumeName) {
 		super(parent, style);
 
-		createPage(allDisks, selectedDisks);
+		createPage(allDisks, selectedDisks, volumeName);
 
 		parent.layout();
 	}
@@ -78,7 +80,7 @@ public class DisksSelectionPage extends Composite {
 		dualTableViewer.addChosenListChangedSelectionListener(listener);
 	}
 
-	private TableLabelProviderAdapter getDiskLabelProvider() {
+	private TableLabelProviderAdapter getDiskLabelProvider(final String volumeName) {
 		return new TableLabelProviderAdapter() {
 
 			@Override
@@ -89,7 +91,7 @@ public class DisksSelectionPage extends Composite {
 
 				Disk disk = (Disk) element;
 				return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServerName()
-						: columnIndex == DISK_TABLE_COLUMN_INDICES.DISK.ordinal() ? disk.getName()
+						: columnIndex == DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY.ordinal() ? disk.getMountPoint() + "/" + volumeName
 								: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE.ordinal() ? NumberUtil
 										.formatNumber(disk.getSpace())
 										: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE_USED.ordinal() ? NumberUtil
@@ -107,13 +109,13 @@ public class DisksSelectionPage extends Composite {
 		return -1;
 	}
 	
-	private void createPage(List<Disk> allDisks, List<Disk> selectedDisks) {
+	private void createPage(List<Disk> allDisks, List<Disk> selectedDisks, String volumeName) {
 		setupPageLayout();
 
 		filterText = guiHelper.createFilterText(this);
 		new Label(this, SWT.NONE);
 
-		createDualTableViewer(allDisks, selectedDisks);
+		createDualTableViewer(allDisks, selectedDisks, volumeName);
 		createFilter(filterText, false); // attach filter text to the dual table viewer for auto-filtering
 
 		Composite buttonContainer = new Composite(this, SWT.NONE);
@@ -134,14 +136,14 @@ public class DisksSelectionPage extends Composite {
 				chosenDisks = getChosenDisks();
 				List<Disk> selectedDisks = getSelectedChosenDisks();
 				
-				chosenDisksContentProvider.removeElements(chosenDisks);
+				chosenBricksContentProvider.removeElements(chosenDisks);
 				for(Disk disk : selectedDisks) {
 					int index = chosenDisks.indexOf(disk);
 					Disk diskAbove = chosenDisks.get(index - 1);
 					chosenDisks.set(index - 1, disk);
 					chosenDisks.set(index, diskAbove);
 				}
-				chosenDisksContentProvider.addElements(chosenDisks);
+				chosenBricksContentProvider.addElements(chosenDisks);
 				dualTableViewer.refreshChosenViewer();
 				updateButtons();
 			}
@@ -158,14 +160,14 @@ public class DisksSelectionPage extends Composite {
 				chosenDisks = getChosenDisks();
 				List<Disk> selectedDisks = getSelectedChosenDisks();
 				
-				chosenDisksContentProvider.removeElements(chosenDisks);
+				chosenBricksContentProvider.removeElements(chosenDisks);
 				for(Disk disk : selectedDisks) {
 					int index = chosenDisks.indexOf(disk);
 					Disk diskBelow = chosenDisks.get(index + 1);
 					chosenDisks.set(index + 1, disk);
 					chosenDisks.set(index, diskBelow);
 				}
-				chosenDisksContentProvider.addElements(chosenDisks);
+				chosenBricksContentProvider.addElements(chosenDisks);
 				dualTableViewer.refreshChosenViewer();
 				updateButtons();
 				
@@ -212,13 +214,13 @@ public class DisksSelectionPage extends Composite {
 		dualTableViewer.setChosenViewerFilter(filter);
 	}
 
-	private void createDualTableViewer(List<Disk> allDisks, List<Disk> selectedDisks) {
+	private void createDualTableViewer(List<Disk> allDisks, List<Disk> selectedDisks, String volumeName) {
 		TableColumnData[] columnData = createColumnData();
-		ITableLabelProvider diskLabelProvider = getDiskLabelProvider();
+		ITableLabelProvider diskLabelProvider = getDiskLabelProvider(volumeName);
 
 		dualTableViewer = new CustomTableDualListComposite<Disk>(this, SWT.NONE, columnData, columnData);
 
-		dualTableViewer.setViewerLabels("Available:", "Chosen:");
+		dualTableViewer.setViewerLabels("Available:", "Selected:");
 
 		dualTableViewer.setAvailableTableLinesVisible(false);
 		dualTableViewer.setAvailableTableHeaderVisible(true);
@@ -229,8 +231,8 @@ public class DisksSelectionPage extends Composite {
 		dualTableViewer.setChosenTableLinesVisible(true);
 		dualTableViewer.setChosenTableHeaderVisible(true);
 
-		chosenDisksContentProvider = new RemovableContentProvider<Disk>(selectedDisks);
-		dualTableViewer.setChosenContentProvider(chosenDisksContentProvider);
+		chosenBricksContentProvider = new RemovableContentProvider<Disk>(selectedDisks);
+		dualTableViewer.setChosenContentProvider(chosenBricksContentProvider);
 		dualTableViewer.setChosenLabelProvider(diskLabelProvider);
 		
 		dualTableViewer.getChosenTable().addSelectionListener(new SelectionAdapter() {
@@ -278,9 +280,9 @@ public class DisksSelectionPage extends Composite {
 	private TableColumnData[] createColumnData() {
 		DISK_TABLE_COLUMN_INDICES[] columns = DISK_TABLE_COLUMN_INDICES.values();
 		TableColumnData[] columnData = new TableColumnData[columns.length];
-
+		int columnNum;
 		for (DISK_TABLE_COLUMN_INDICES column : columns) {
-			int columnNum = column.ordinal();
+			columnNum = column.ordinal();
 			columnData[columnNum] = new TableColumnData(columnNum, DISK_TABLE_COLUMNS_NAMES[columnNum], 100);
 		}
 		return columnData;
@@ -297,7 +299,7 @@ public class DisksSelectionPage extends Composite {
 	
 	
 	public List<Disk> getChosenDisks() {
-		Object[] disksArr = (Object[]) chosenDisksContentProvider.getElements(dualTableViewer);
+		Object[] disksArr = (Object[]) chosenBricksContentProvider.getElements(dualTableViewer);
 		if (disksArr != null) {
 			List<Disk> disks = new ArrayList<Disk>();
 			for (Object disk : disksArr) {
@@ -308,15 +310,18 @@ public class DisksSelectionPage extends Composite {
 		return null;
 	}
 
-	public List<String> getChosenBricks() {
-		Object[] disksArr = (Object[]) chosenDisksContentProvider.getElements(dualTableViewer);
-		if (disksArr != null) {
-			List<String> disks = new ArrayList<String>();
-			for (Object disk : disksArr) {
-				disks.add( ((Disk)disk).getServerName() + ":" + ((Disk)disk).getName() ); // Format: Server:disk
+	public List<Brick> getChosenBricks(String volumeName) {
+		Object[] bricksArr = (Object[]) chosenBricksContentProvider.getElements(dualTableViewer);
+		
+		if (bricksArr != null) {
+			List<Brick> bricks = new ArrayList<Brick>();
+			for (Object disk : bricksArr) {
+				bricks.add( new Brick( ((Disk) disk).getServerName(), BRICK_STATUS.ONLINE, ((Disk) disk).getName(), ((Disk) disk).getMountPoint() + "/" + volumeName)); // Assumption mount point is not having trailing "/"
 			}
-			return disks;
+			return bricks;
 		}
 		return null;
 	}
+
+	
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
index fec00b7d..d46c71d8 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
@@ -18,6 +18,7 @@
  *******************************************************************************/
 package com.gluster.storage.management.gui.dialogs;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -47,8 +48,10 @@ import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
 
 import com.gluster.storage.management.client.GlusterDataModelManager;
+import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Disk;
 import com.gluster.storage.management.core.model.Volume;
+import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
 import com.gluster.storage.management.core.model.Volume.NAS_PROTOCOL;
 import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
 import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
@@ -64,6 +67,7 @@ public class CreateVolumePage1 extends WizardPage {
 	private Button btnNfs;
 	private Button btnStartVolume;
 	private Link linkCustomize;
+	private List<Disk> selectedDisks;
 
 	/**
 	 * Create the wizard.
@@ -71,11 +75,11 @@ public class CreateVolumePage1 extends WizardPage {
 	public CreateVolumePage1() {
 		super(PAGE_NAME);
 		setTitle("Create Volume");
-		setDescription("Create a new Volume by choosing disks from the cluster servers and configuring the volume properties.");
+		setDescription("Create a new Volume by choosing bricks from the cluster servers and configuring the volume properties.");
 		
 		// by default, we create volume with all available disks
 		allDisks = GlusterDataModelManager.getInstance().getReadyDisksOfAllServers();
-		volume.setDisks(getBricks(allDisks)); // volume.setDisks(allDisks);
+		selectedDisks = allDisks; // volume.setDisks(allDisks);
 	}
 	
 	private List<String> getBricks(List<Disk> allDisks) {
@@ -183,20 +187,21 @@ public class CreateVolumePage1 extends WizardPage {
 
 	private void createDisksCustomizeLink(Composite container) {
 		linkCustomize = new Link(container, SWT.UNDERLINE_LINK);
-		linkCustomize.setText("All Disk(s) (<a>customize</a>)");
+		linkCustomize.setText("All Brick(s) (<a>customize</a>)" );
+		linkCustomize.setEnabled(false);
 		linkCustomize.addListener (SWT.Selection, new Listener () {
 			public void handleEvent(Event event) {
 				Display.getDefault().asyncExec(new Runnable() {
 					
 					@Override
 					public void run() {
-						SelectDisksDialog dialog = new SelectDisksDialog(getShell(), allDisks, volume.getDisks());
+						SelectDisksDialog dialog = new SelectDisksDialog(getShell(), allDisks, selectedDisks, txtName.getText().trim());
 
 						dialog.create();
 				        if(dialog.open() == Window.OK) {
 				        	// user has customized disks. get them from the dialog box.
-				        	volume.setDisks(dialog.getSelectedBricks());
-				        	linkCustomize.setText("" + volume.getDisks().size() + " Disk(s) (<a>customize</a>)");
+				        	selectedDisks = dialog.getSelectedDisks();
+				        	linkCustomize.setText("" + selectedDisks.size() + " Brick(s) (<a>customize</a>)");
 				        	validateForm();
 				        }
 					}
@@ -254,7 +259,8 @@ public class CreateVolumePage1 extends WizardPage {
 		txtName = new Text(container, SWT.BORDER);
 		GridData txtNameData = new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1);
 		txtNameData.widthHint = 300;
-		txtName.setLayoutData(txtNameData);		
+		txtName.setTextLimit(32);
+		txtName.setLayoutData(txtNameData);
 		txtName.addModifyListener(new ModifyListener() {
 			@Override
 			public void modifyText(ModifyEvent e) {
@@ -300,6 +306,11 @@ public class CreateVolumePage1 extends WizardPage {
 		
 		volume.setAccessControlList(txtAccessControl.getText());
 		
+		for(Disk disk : selectedDisks) {
+			Brick brick = new Brick(disk.getServerName(), BRICK_STATUS.ONLINE, disk.getName(), disk.getMountPoint() + File.separator + volume.getName());
+			volume.addBrick(brick);
+		}
+		
 		return volume;
 	}
 	
@@ -326,7 +337,7 @@ public class CreateVolumePage1 extends WizardPage {
 	}
 
 	private void validateDisks() {
-		int diskCount = volume.getDisks().size();
+		int diskCount = selectedDisks.size();
 		
 		if(diskCount  < 1) {
 			setError("At least one disk must be selected!");
@@ -356,8 +367,14 @@ public class CreateVolumePage1 extends WizardPage {
 	private void validateVolumeName() {
 		String volumeName = txtName.getText().trim();
 		String volumeNameToken = "^[a-zA-Z][a-zA-Z0-9\\-]*";
+		
+		if (volumeName.length() > 0) {
+			linkCustomize.setEnabled(true);
+		}
+		
 		if(volumeName.length() == 0) {
 			setError("Please enter Volume Name");
+			linkCustomize.setEnabled(false);
 		}
 		
 		if (!volumeName.matches(volumeNameToken)) {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskPage1.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskPage1.java
index 24f0fe5b..ba2d748f 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskPage1.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskPage1.java
@@ -36,7 +36,9 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
+
 import com.gluster.storage.management.client.GlusterDataModelManager;
+import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Disk;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.utils.NumberUtil;
@@ -47,31 +49,30 @@ public class MigrateDiskPage1 extends WizardPage {
 	private static final String PAGE_NAME = "migrate.disk.page.1";
 
 	private enum DISK_TABLE_COLUMN_INDICES {
-		SERVER, DISK, SPACE, SPACE_IN_USE
+		SERVER, BRICK_DIRECTORY, SPACE, SPACE_IN_USE
 	}
 
-	private static final String[] DISK_TABLE_COLUMN_NAMES = { "Server", "Disk", "Space (GB)", "Used Space (GB)" };
+	private static final String[] DISK_TABLE_COLUMN_NAMES = { "Server", "Brick Directory", "Space (GB)", "Used Space (GB)" };
 
 	private Volume volume;
-	private Disk fromDisk;
+	private Brick fromBrick;
 	private static final GUIHelper guiHelper = GUIHelper.getInstance();
 
 	private TableViewer tableViewerTo;
 
 	private TableViewer tableViewerFrom;
 
-	private ITableLabelProvider getDiskLabelProvider() {
+	private ITableLabelProvider getDiskLabelProvider(final String volumeName) {
 		return new TableLabelProviderAdapter() {
-
+			
 			@Override
 			public String getColumnText(Object element, int columnIndex) {
 				if (!(element instanceof Disk)) {
 					return null;
 				}
-
 				Disk disk = (Disk) element;
 				return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServerName()
-						: columnIndex == DISK_TABLE_COLUMN_INDICES.DISK.ordinal() ? disk.getName()
+						: columnIndex == DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY.ordinal() ? disk.getMountPoint() + "/" + volumeName
 								: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE.ordinal() ? NumberUtil
 										.formatNumber(disk.getSpace())
 										: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal() ? NumberUtil
@@ -88,7 +89,7 @@ public class MigrateDiskPage1 extends WizardPage {
 		parent.setLayout(tableColumnLayout);
 
 		setColumnProperties(table, DISK_TABLE_COLUMN_INDICES.SERVER, SWT.CENTER, 100);
-		setColumnProperties(table, DISK_TABLE_COLUMN_INDICES.DISK, SWT.CENTER, 100);
+		setColumnProperties(table, DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY, SWT.CENTER, 100);
 		setColumnProperties(table, DISK_TABLE_COLUMN_INDICES.SPACE, SWT.CENTER, 90);
 		setColumnProperties(table, DISK_TABLE_COLUMN_INDICES.SPACE_IN_USE, SWT.CENTER, 90);
 	}
@@ -112,11 +113,11 @@ public class MigrateDiskPage1 extends WizardPage {
 	/**
 	 * Create the wizard.
 	 */
-	public MigrateDiskPage1(Volume volume, Disk disk) {
+	public MigrateDiskPage1(Volume volume, Brick brick) {
 		super(PAGE_NAME);
 		this.volume = volume;
-		this.fromDisk = disk;
-		setTitle("Migrate Disk [" + volume.getName() + "]");
+		this.fromBrick = brick;
+		setTitle("Migrate Brick [" + volume.getName() + "]");
 		// setDescription("Migrate data from one disk to another for the chosen Volume. " +
 		// "This will copy all data present in the \"from disk\" of the volume " +
 		// "to \"to disk\", remove \"from disk\" from the volume, and " +
@@ -127,10 +128,10 @@ public class MigrateDiskPage1 extends WizardPage {
 
 	private void setPageDescription(String source, String target) {
 		if (source == null || source == "") {
-			source = "From Disk";
+			source = "From Brick";
 		}
 		if (target == null || target == "") {
-			target = "To Disk";
+			target = "To Brick";
 		}
 		setDescription("Migrate volume data from \"" + source + "\" to \"" + target + "\"");
 	}
@@ -186,34 +187,34 @@ public class MigrateDiskPage1 extends WizardPage {
 		//labelLayoutData.verticalIndent = 10;
 		
 		Label lblFromDisk = new Label(container, SWT.NONE);
-		lblFromDisk.setText("From Disk:");
+		lblFromDisk.setText("From Brick:");
 		lblFromDisk.setLayoutData(labelLayoutData);
 		Label lblToDisk = new Label(container, SWT.NONE);
-		lblToDisk.setText("To Disk:");
+		lblToDisk.setText("To Brick:");
 		lblToDisk.setLayoutData(labelLayoutData);
 
 		Text txtFilterFrom = guiHelper.createFilterText(container);
 		Text txtFilterTo = guiHelper.createFilterText(container);
 		
-		ITableLabelProvider diskLabelProvider = getDiskLabelProvider();
+		ITableLabelProvider diskLabelProvider = getDiskLabelProvider(volume.getName());
 
 		GlusterDataModelManager glusterDataModelManager = GlusterDataModelManager.getInstance();
-		List<Disk> fromDisks = glusterDataModelManager.getReadyDisksOfVolume(volume);
+		List<Disk> fromBricks = glusterDataModelManager.getReadyDisksOfVolume(volume);
 		List<Disk> toDisks = glusterDataModelManager.getReadyDisksOfAllServersExcluding( glusterDataModelManager.getReadyDisksOfVolume(volume));
 		
-		tableViewerFrom = createTableViewer(container, diskLabelProvider, fromDisks, txtFilterFrom);
+		tableViewerFrom = createTableViewer(container, diskLabelProvider, fromBricks, txtFilterFrom);
 		
-		if(fromDisk != null) {
-			setFromDisk(tableViewerFrom, fromDisk);
+		if(fromBrick != null) {
+			setFromDisk(tableViewerFrom, fromBrick);
 		}
 		tableViewerTo = createTableViewer(container, diskLabelProvider, toDisks, txtFilterTo);
 	}
 
-	private void setFromDisk(TableViewer tableViewer, Disk diskToSelect) {
+	private void setFromDisk(TableViewer tableViewer, Brick brickToSelect) {
 		Table table = tableViewer.getTable();
 		for (int i = 0; i < table.getItemCount(); i++) {
 			TableItem item = table.getItem(i);
-			if (item.getData() == diskToSelect) {
+			if (item.getData() == brickToSelect) {
 				table.select(i);
 				return;
 			}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java
index 70b4bbf6..61142c5f 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java
@@ -22,24 +22,25 @@ import org.eclipse.jface.wizard.Wizard;
 
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.client.VolumesClient;
+import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Disk;
 import com.gluster.storage.management.core.model.Volume;
 
 public class MigrateDiskWizard extends Wizard {
 	private Volume volume;
-	private Disk disk;
+	private Brick brick;
 	private MigrateDiskPage1 page;
 
-	public MigrateDiskWizard(Volume volume, Disk disk) {
-		setWindowTitle("Gluster Management Console - Migrate Disk [" + volume.getName() + "]");
+	public MigrateDiskWizard(Volume volume, Brick brick) {
+		setWindowTitle("Gluster Management Console - Migrate Brick [" + volume.getName() + "]");
 		this.volume = volume;
-		this.disk = disk;
+		this.brick = brick;
 		setHelpAvailable(false); // TODO: Introduce wizard help
 	}
 
 	@Override
 	public void addPages() {
-		page = new MigrateDiskPage1(volume, disk);
+		page = new MigrateDiskPage1(volume, brick);
 		addPage(page);
 	}
 
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 08a35357..a4152899 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
@@ -32,37 +32,27 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 
+import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Disk;
 
 public class SelectDisksDialog extends Dialog {
 
-	private DisksSelectionPage disksPage;
+	private BricksSelectionPage disksPage;
 	private List<Disk> allDisks;
 	private List<Disk> selectedDisks;
+	private String volumeName;
 
 	/**
 	 * Create the dialog.
 	 * 
 	 * @param parentShell
 	 */
-	public SelectDisksDialog(Shell parentShell, List<Disk> allDisks, List<String> selectedDisks) {
+	public SelectDisksDialog(Shell parentShell, List<Disk> allDisks, List<Disk> selectedDisks, String volumeName) {
 		super(parentShell);
 		setShellStyle(getShellStyle() | SWT.RESIZE);
 		this.allDisks = allDisks;
-		this.selectedDisks = getSelectedDisks(allDisks, selectedDisks);
-	}
-
-	private List<Disk> getSelectedDisks(List<Disk> allDisks, List<String> selectedDisks) {
-		List<Disk> disks = new ArrayList<Disk>();
-		for (String selectedDisk : selectedDisks) {
-			for (Disk disk : allDisks) {
-				String brick[] = selectedDisk.split(":");
-				if (disk.getServerName().equals(brick[0]) && disk.getName().equals(brick[1])) {
-					disks.add(disk);
-				}
-			}
-		}
-		return disks;
+		this.selectedDisks = selectedDisks;
+		this.volumeName = volumeName;
 	}
 
 	/**
@@ -78,9 +68,9 @@ public class SelectDisksDialog extends Dialog {
 		GridData containerLayoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
 		container.setLayoutData(containerLayoutData);
 
-		getShell().setText("Create Volume - Select Disks");
+		getShell().setText("Create Volume - Select Bricks");
 
-		disksPage = new DisksSelectionPage(container, SWT.NONE, allDisks, selectedDisks);
+		disksPage = new BricksSelectionPage(container, SWT.NONE, allDisks, selectedDisks, volumeName);
 
 		return container;
 	}
@@ -105,14 +95,14 @@ public class SelectDisksDialog extends Dialog {
 	}
 
 	@Override
-	protected void cancelPressed() { System.out.println("Test");
+	protected void cancelPressed() {
 		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 Brick(s)", "Please select atlease one brick");
 		} else {
 			super.okPressed();
 		}
@@ -122,7 +112,7 @@ public class SelectDisksDialog extends Dialog {
 		return disksPage.getChosenDisks();
 	}
 
-	public List<String> getSelectedBricks() {
-		return disksPage.getChosenBricks();
+	public List<Brick> getSelectedBricks(String volumeName) {
+		return disksPage.getChosenBricks(volumeName);
 	}
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterViewsManager.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterViewsManager.java
index 2b2645fc..b4b31a0a 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterViewsManager.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterViewsManager.java
@@ -84,7 +84,7 @@ public class GlusterViewsManager implements ViewsManager {
 
 	private void showViewsForVolume(Volume volume) throws PartInitException {
 		page.showView(VolumeSummaryView.ID);
-		page.showView(VolumeDisksView.ID, null, IWorkbenchPage.VIEW_CREATE);
+		page.showView(VolumeBricksView.ID, null, IWorkbenchPage.VIEW_CREATE);
 		page.showView(VolumeOptionsView.ID, null, IWorkbenchPage.VIEW_CREATE);
 		page.showView(VolumeLogsView.ID, null, IWorkbenchPage.VIEW_CREATE);
 	}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeDisksView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeBricksView.java
index 57065928..cc699a94 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeDisksView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeBricksView.java
@@ -5,15 +5,14 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 
 import com.gluster.storage.management.client.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.GlusterDataModel;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.details.DisksPage;
+import com.gluster.storage.management.gui.views.details.BricksPage;
 
-public class VolumeDisksView extends ViewPart {
-	public static final String ID = VolumeDisksView.class.getName();
+public class VolumeBricksView extends ViewPart {
+	public static final String ID = VolumeBricksView.class.getName();
 	private static final GUIHelper guiHelper = GUIHelper.getInstance();
-	private DisksPage page;
+	private BricksPage page;
 	private Volume volume;
 
 	@Override
@@ -29,7 +28,7 @@ public class VolumeDisksView extends ViewPart {
 	 * @param parent
 	 */
 	private void createPage(Composite parent) {
-		page = new DisksPage(parent, SWT.NONE, getSite(), GlusterDataModelManager.getInstance().getReadyDisksOfVolume(volume));
+		page = new BricksPage(parent, SWT.NONE, getSite(), GlusterDataModelManager.getInstance().getOnlineBricks(volume));
 		parent.layout(); // IMP: lays out the form properly
 	}
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
index b8356ed0..c1597bae 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
@@ -410,7 +410,7 @@ public class VolumeSummaryView extends ViewPart {
 	}
 
 	private void createNumOfDisksField(Composite section) {
-		toolkit.createLabel(section, "Number of Disks: ", SWT.NONE);
+		toolkit.createLabel(section, "Number of Bricks: ", SWT.NONE);
 		toolkit.createLabel(section, "" + volume.getNumOfDisks(), SWT.NONE);
 		toolkit.createLabel(section, "", SWT.NONE); // dummy
 	}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/AbstractBricksPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/AbstractBricksPage.java
new file mode 100644
index 00000000..c752a488
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/AbstractBricksPage.java
@@ -0,0 +1,153 @@
+/*******************************************************************************
+ * 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.views.details;
+
+import java.util.List;
+
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.TableEditor;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IWorkbenchSite;
+import org.eclipse.ui.forms.events.HyperlinkAdapter;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.ImageHyperlink;
+
+import com.gluster.storage.management.core.model.Brick;
+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.Entity;
+import com.gluster.storage.management.gui.Application;
+import com.gluster.storage.management.gui.IEntityListener;
+import com.gluster.storage.management.gui.jobs.InitializeDiskJob;
+import com.gluster.storage.management.gui.utils.GUIHelper;
+
+public abstract class AbstractBricksPage extends Composite implements IEntityListener {
+	protected final FormToolkit toolkit = new FormToolkit(Display.getCurrent());
+	protected TableViewer tableViewer;
+	private IWorkbenchSite site;
+	protected static final GUIHelper guiHelper = GUIHelper.getInstance();
+
+	/**
+	 * Setup properties of the table e.g. column headers, widths, etc.
+	 * 
+	 * @param parent
+	 *            The parent composite. (TableColumnLayout has to be set on this)
+	 * @param table
+	 *            The table to be set up
+	 */
+	protected abstract void setupDiskTable(Composite parent, Table table);
+
+	/**
+	 * @return The label provider to be used with the disk table viewer
+	 */
+	protected abstract ITableLabelProvider getTableLabelProvider();
+
+	/**
+	 * @return Index of the "status" column in the table. Return -1 if status column is not displayed
+	 */
+	protected abstract int getStatusColumnIndex();
+
+	private void init(final Composite parent, IWorkbenchSite site, List<Brick> bricks) {
+		addDisposeListener(new DisposeListener() {
+			public void widgetDisposed(DisposeEvent e) {
+				toolkit.dispose();
+			}
+		});
+
+		this.site = site;
+
+		setupPageLayout();
+		Text filterText = guiHelper.createFilterText(toolkit, this);
+		setupBrickTableViewer(createTableViewerComposite(), filterText);
+		site.setSelectionProvider(tableViewer);
+
+		tableViewer.setInput(bricks);
+
+		site.setSelectionProvider(tableViewer);
+		Application.getApplication().addEntityListener(this);
+
+		parent.layout(); // Important - this actually paints the table
+
+		toolkit.adapt(this);
+		toolkit.paintBordersFor(this);
+
+		/**
+		 * Ideally not required. However the table viewer is not getting laid out properly on performing
+		 * "maximize + restore" So this is a hack to make sure that the table is laid out again on re-size of the window
+		 */
+		addPaintListener(new PaintListener() {
+			@Override
+			public void paintControl(PaintEvent e) {
+				parent.layout();
+			}
+		});
+	}
+
+	public AbstractBricksPage(final Composite parent, int style, IWorkbenchSite site, List<Brick> bricks) {
+		super(parent, style);
+		init(parent, site, bricks);
+	}
+
+	private void setupPageLayout() {
+		final GridLayout layout = new GridLayout(1, false);
+		layout.verticalSpacing = 10;
+		layout.marginTop = 10;
+		setLayout(layout);
+	}
+
+	private Composite createTableViewerComposite() {
+		Composite tableViewerComposite = new Composite(this, SWT.NO);
+		tableViewerComposite.setLayout(new FillLayout(SWT.HORIZONTAL));
+		tableViewerComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		return tableViewerComposite;
+	}
+
+	private TableViewer createBrickTableViewer(Composite parent) {
+		tableViewer = CheckboxTableViewer.newCheckList(parent, SWT.FLAT | SWT.FULL_SELECTION | SWT.MULTI );
+
+		tableViewer.setLabelProvider(getTableLabelProvider());
+		tableViewer.setContentProvider(new ArrayContentProvider());
+
+		setupDiskTable(parent, tableViewer.getTable());
+
+		return tableViewer;
+	}
+
+	private void setupBrickTableViewer(Composite parent, final Text filterText) {
+		tableViewer = createBrickTableViewer(parent);
+		// Create a case insensitive filter for the table viewer using the filter text field
+		guiHelper.createFilter(tableViewer, filterText, false);
+	}
+}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/BricksPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/BricksPage.java
new file mode 100644
index 00000000..7587d0b8
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/BricksPage.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * 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.views.details;
+
+import java.util.List;
+
+import org.eclipse.jface.layout.TableColumnLayout;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.ui.IWorkbenchSite;
+
+import com.gluster.storage.management.core.model.Brick;
+import com.gluster.storage.management.core.model.Entity;
+import com.gluster.storage.management.gui.BrickTableLabelProvider;
+
+public class BricksPage extends AbstractBricksPage {
+
+	public enum BRICK_TABLE_COLUMN_INDICES {
+		SERVER, BRICK, SPACE, SPACE_IN_USE, STATUS
+	};
+
+	private static final String[] DISK_TABLE_COLUMN_NAMES = new String[] { "Server", "Brick Directory", "Space (GB)",
+			"Space in Use (GB)", "Status" };
+
+	public BricksPage(final Composite parent, int style, IWorkbenchSite site, List<Brick> bricks) {
+		super(parent, style, site, bricks);
+	}
+
+	@Override
+	protected void setupDiskTable(Composite parent, Table table) {
+		table.setHeaderVisible(true);
+		table.setLinesVisible(false);
+
+		TableColumnLayout tableColumnLayout = guiHelper.createTableColumnLayout(table, DISK_TABLE_COLUMN_NAMES);
+		parent.setLayout(tableColumnLayout);
+
+		guiHelper.setColumnProperties(table, BRICK_TABLE_COLUMN_INDICES.SERVER.ordinal(), SWT.CENTER, 100);
+		guiHelper.setColumnProperties(table, BRICK_TABLE_COLUMN_INDICES.BRICK.ordinal(), SWT.CENTER, 100);
+		guiHelper.setColumnProperties(table, BRICK_TABLE_COLUMN_INDICES.SPACE.ordinal(), SWT.CENTER, 90);
+		guiHelper.setColumnProperties(table, BRICK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal(), SWT.CENTER, 90);
+	}
+
+	@Override
+	protected ITableLabelProvider getTableLabelProvider() {
+		return new BrickTableLabelProvider();
+	}
+
+	@Override
+	protected int getStatusColumnIndex() {
+		return BRICK_TABLE_COLUMN_INDICES.STATUS.ordinal();
+	}
+
+	@Override
+	public void entityChanged(Entity entity, String[] paremeters) {
+		// TODO Auto-generated method stub
+		
+	}
+}
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/DisksPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/DisksPage.java
index 9ea962de..a8d6f125 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/DisksPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/DisksPage.java
@@ -36,7 +36,7 @@ public class DisksPage extends AbstractDisksPage {
 		SERVER, DISK, SPACE, SPACE_IN_USE, STATUS
 	};
 
-	private static final String[] DISK_TABLE_COLUMN_NAMES = new String[] { "Server", "Disk", "Space (GB)",
+	private static final String[] DISK_TABLE_COLUMN_NAMES = new String[] { "Server", "Brick Directory", "Space (GB)",
 			"Space in Use (GB)", "Status" };
 
 	public DisksPage(final Composite parent, int style, IWorkbenchSite site, List<Disk> disks) {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java
index df9f8533..ffbea8c1 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java
@@ -55,6 +55,7 @@ import com.gluster.storage.management.core.model.LogMessage;
 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.utils.GlusterCoreUtil;
 import com.gluster.storage.management.gui.VolumeLogTableLabelProvider;
 import com.gluster.storage.management.gui.utils.GUIHelper;
 
@@ -65,7 +66,7 @@ public class VolumeLogsPage extends Composite {
 	private Text filterText;
 	private Text lineCountText;
 	private Volume volume;
-	
+
 	public enum LOG_TABLE_COLUMN_INDICES {
 		DATE, TIME, DISK, SEVERITY, MESSAGE
 	};
@@ -83,14 +84,16 @@ public class VolumeLogsPage extends Composite {
 
 	/**
 	 * Create the volume logs page
+	 * 
 	 * @param parent
 	 * @param style
-	 * @param volume Volume for which the logs page is to be created	
+	 * @param volume
+	 *            Volume for which the logs page is to be created
 	 */
 	public VolumeLogsPage(Composite parent, int style, Volume volume) {
 		super(parent, style);
 		this.volume = volume;
-		
+
 		addDisposeListener(new DisposeListener() {
 			public void widgetDisposed(DisposeEvent e) {
 				toolkit.dispose();
@@ -98,35 +101,35 @@ public class VolumeLogsPage extends Composite {
 		});
 		toolkit.adapt(this);
 		toolkit.paintBordersFor(this);
-		
+
 		configureLayout();
-		
+
 		Composite composite = toolkit.createComposite(this, SWT.NONE);
 		toolkit.paintBordersFor(composite);
-		
+
 		createLineCountLabel(composite);
 		createLineCountText(composite);
-		
+
 		createDiskLabel(composite);
 		createDisksCombo(composite);
-		
+
 		createSeverityLabel(composite);
 		createSeverityCombo(composite);
-		
+
 		createFromDateLabel(composite);
 		createFromDateField(composite);
 		createFromTimeField(composite);
 		createFromCheckbox(composite);
-		
+
 		createToDateLabel(composite);
 		createToDateField(composite);
 		createToTimeField(composite);
 		createToCheckbox(composite);
-		
+
 		createSearchButton(composite);
-		
+
 		createSeparator(composite);
-		
+
 		createFilterLabel(composite);
 		createFilterText(composite);
 
@@ -135,7 +138,7 @@ public class VolumeLogsPage extends Composite {
 
 	private void createLogTableViewer() {
 		Composite tableViewerComposite = createTableViewerComposite();
-		
+
 		tableViewer = new TableViewer(tableViewerComposite, SWT.FLAT | SWT.FULL_SELECTION | SWT.MULTI);
 		tableViewer.setLabelProvider(new VolumeLogTableLabelProvider());
 		tableViewer.setContentProvider(new ArrayContentProvider());
@@ -169,23 +172,23 @@ public class VolumeLogsPage extends Composite {
 
 				Date fromTimestamp = null;
 				Date toTimestamp = null;
-				
-				if(fromCheckbox.getSelection()) {
+
+				if (fromCheckbox.getSelection()) {
 					fromTimestamp = extractTimestamp(fromDate, fromTime);
 				}
-				
-				if(toCheckbox.getSelection()) {
+
+				if (toCheckbox.getSelection()) {
 					toTimestamp = extractTimestamp(toDate, toTime);
 				}
-				
+
 				if (!validateTimeRange(fromTimestamp, toTimestamp)) {
 					return;
 				}
-				
+
 				LogMessageListResponse response = client.getLogs(volume.getName(), disksCombo.getText(),
 						severityCombo.getText(), fromTimestamp, toTimestamp, Integer.parseInt(lineCountText.getText()));
 				Status status = response.getStatus();
-				if(status.isSuccess()) {
+				if (status.isSuccess()) {
 					List<LogMessage> logMessages = response.getLogMessages();
 					tableViewer.setInput(logMessages.toArray(new LogMessage[0]));
 					tableViewer.refresh();
@@ -198,30 +201,30 @@ public class VolumeLogsPage extends Composite {
 	}
 
 	protected boolean validateTimeRange(Date fromTimestamp, Date toTimestamp) {
-		if(fromTimestamp == null && toTimestamp == null) {
+		if (fromTimestamp == null && toTimestamp == null) {
 			// no time range selected. nothing to validate.
 			return true;
 		}
-		
+
 		Calendar calendar = Calendar.getInstance();
 		Date now = calendar.getTime();
-		if(fromTimestamp != null && fromTimestamp.after(now)) {
+		if (fromTimestamp != null && fromTimestamp.after(now)) {
 			MessageDialog.openError(getShell(), "Volume Logs", "From time can't be greater than current time!");
 			return false;
 		}
-		
-		if(toTimestamp != null) {
+
+		if (toTimestamp != null) {
 			if (toTimestamp.after(now)) {
 				MessageDialog.openError(getShell(), "Volume Logs", "To time can't be greater than current time!");
 				return false;
 			}
-			
-			if(fromTimestamp.after(toTimestamp)) {
+
+			if (fromTimestamp.after(toTimestamp)) {
 				MessageDialog.openError(getShell(), "Volume Logs", "From time can't be greater than To time!");
 				return false;
 			}
 		}
-		
+
 		return true;
 	}
 
@@ -304,11 +307,11 @@ public class VolumeLogsPage extends Composite {
 	private void createSeverityCombo(Composite composite) {
 		severityCombo = new Combo(composite, SWT.READ_ONLY);
 		severityCombo.setBounds(555, 15, 110, 20);
-		
+
 		severityCombo.setItems(GlusterConstants.VOLUME_LOG_LEVELS_ARR.toArray(new String[0]));
 		severityCombo.select(VOLUME_LOG_LEVELS.ERROR.ordinal());
 		severityCombo.add(CoreConstants.ALL, 0);
-		
+
 		toolkit.adapt(severityCombo);
 		toolkit.paintBordersFor(severityCombo);
 	}
@@ -321,7 +324,7 @@ public class VolumeLogsPage extends Composite {
 	private void createDisksCombo(Composite composite) {
 		disksCombo = new Combo(composite, SWT.READ_ONLY);
 		disksCombo.setBounds(365, 15, 100, 20);
-		disksCombo.setItems(volume.getDisks().toArray(new String[0]));
+		disksCombo.setItems(volume.getBricks().toArray(new String[0]));
 		disksCombo.add(CoreConstants.ALL, 0);
 		toolkit.adapt(disksCombo);
 		toolkit.paintBordersFor(disksCombo);
@@ -329,7 +332,7 @@ public class VolumeLogsPage extends Composite {
 	}
 
 	private void createDiskLabel(Composite composite) {
-		Label lblMessagesAndFilter = toolkit.createLabel(composite, "messages, and filter on disk", SWT.NONE);
+		Label lblMessagesAndFilter = toolkit.createLabel(composite, "messages, and filter on bricks", SWT.NONE);
 		lblMessagesAndFilter.setBounds(160, 15, 200, 20);
 	}
 
@@ -348,10 +351,10 @@ public class VolumeLogsPage extends Composite {
 		GridData layoutData = new GridData();
 		layoutData.grabExcessHorizontalSpace = true;
 		layoutData.grabExcessVerticalSpace = true;
-		//layoutData.verticalIndent = 10;
+		// layoutData.verticalIndent = 10;
 		setLayoutData(layoutData);
 	}
-	
+
 	private Composite createTableViewerComposite() {
 		Composite tableViewerComposite = new Composite(this, SWT.NO);
 		tableViewerComposite.setLayout(new FillLayout(SWT.HORIZONTAL));
@@ -360,7 +363,7 @@ public class VolumeLogsPage extends Composite {
 		tableViewerComposite.setLayoutData(layoutData);
 		return tableViewerComposite;
 	}
-	
+
 	private void setupLogsTable(Composite parent, Table table) {
 		table.setHeaderVisible(true);
 		table.setLinesVisible(false);
@@ -374,7 +377,7 @@ public class VolumeLogsPage extends Composite {
 		setColumnProperties(table, LOG_TABLE_COLUMN_INDICES.SEVERITY, SWT.CENTER, 50);
 		setColumnProperties(table, LOG_TABLE_COLUMN_INDICES.MESSAGE, SWT.LEFT, 100);
 	}
-	
+
 	/**
 	 * Sets properties for alignment and weight of given column of given table
 	 * 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/VolumeTabCreator.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/VolumeTabCreator.java
index 6913e211..dc3186e1 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/VolumeTabCreator.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/VolumeTabCreator.java
@@ -42,6 +42,7 @@ import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 import com.gluster.storage.management.core.utils.NumberUtil;
 import com.gluster.storage.management.gui.IImageKeys;
 import com.gluster.storage.management.gui.utils.GUIHelper;
+import com.gluster.storage.management.gui.views.details.BricksPage;
 import com.gluster.storage.management.gui.views.details.DisksPage;
 import com.gluster.storage.management.gui.views.details.TabCreator;
 import com.gluster.storage.management.gui.views.details.VolumeLogsPage;
@@ -248,8 +249,7 @@ public class VolumeTabCreator implements TabCreator {
 
 	private void createVolumeDisksTab(Volume volume, TabFolder tabFolder, FormToolkit toolkit, IWorkbenchSite site) {
 		Composite volumeDisksTab = guiHelper.createTab(tabFolder, "Disks", IImageKeys.VOLUME);
-		DisksPage page = new DisksPage(volumeDisksTab, SWT.NONE, site, GlusterDataModelManager.getInstance().getReadyDisksOfVolume(volume));
-
+		BricksPage page = new BricksPage(volumeDisksTab, SWT.NONE, site, GlusterDataModelManager.getInstance().getOnlineBricks(volume));
 		volumeDisksTab.layout(); // IMP: lays out the form properly
 	}
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java
index 9e25a018..680dc391 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java
@@ -56,7 +56,7 @@ public class VolumesPage extends Composite {
 	};
 	
 	private static final String[] VOLUME_TABLE_COLUMN_NAMES = new String[] { "Name",
-			"Volume Type", "Number of\nDisks", "Transport Type", "Status" };
+			"Volume Type", "Number of\nBricks", "Transport Type", "Status" };
 
 	public VolumesPage(final Composite parent, IWorkbenchSite site, EntityGroup<Volume> volumes) {
 		super(parent, SWT.NONE);