Demo feedback changes on volumes

6 files changed, 46 insertions, 25 deletions

diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CreateVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CreateVolumeAction.java
index 38be70bd..f8590171 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CreateVolumeAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CreateVolumeAction.java
@@ -42,7 +42,7 @@ public class CreateVolumeAction extends AbstractActionDelegate {
 			}
 		};
 		dialog.create();
-		dialog.getShell().setSize(500, 610);
+		dialog.getShell().setSize(510, 620);
 		dialog.open();
 	}
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java
index fe9bb80a..9fd4f99b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java
@@ -38,6 +38,6 @@ public class RefreshDataAction extends AbstractActionDelegate {
 	 */
 	@Override
 	protected void performAction(IAction action) {
-		new DataSyncJob("Cluster Data Sync").schedule();
+		new DataSyncJob("Reteriving Management Information").schedule();
 	}
 }
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickPage.java
index aa0a0b9c..b2cb3582 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickPage.java
@@ -59,7 +59,7 @@ public class AddBrickPage extends WizardPage {
 		setTitle("Add Brick");
 
 		String description = "Add bricks to [" + volume.getName() + "] ";
-		if ( volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_MIRROR) {
+		if ( volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_REPLICATE) {
 			description += "(in multiples of " + volume.getReplicaCount() + ")";
 		} else if (volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_STRIPE) {
 			description += "(in multiples of " + volume.getStripeCount() + ")";
@@ -105,7 +105,7 @@ public class AddBrickPage extends WizardPage {
 			return false;
 		}
 		switch (volume.getVolumeType()) {
-		case DISTRIBUTED_MIRROR:
+		case DISTRIBUTED_REPLICATE:
 			return (diskCount % volume.getReplicaCount() == 0);
 		case DISTRIBUTED_STRIPE:
 			return (diskCount % volume.getStripeCount() == 0);
@@ -143,9 +143,9 @@ public class AddBrickPage extends WizardPage {
 
 	private void setError() {
 		String errorMessage = null;
-		if ( volume.getVolumeType() == VOLUME_TYPE.PLAIN_DISTRIBUTE) {
+		if ( volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTE) {
 			errorMessage = "Please select at least one brick!";
-		} else if( volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_MIRROR) {
+		} else if( volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_REPLICATE) {
 			errorMessage = "Please select bricks in multiples of " + volume.getReplicaCount();
 		} else {
 			errorMessage = "Please select bricks in multiples of " + volume.getStripeCount();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumePage1.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumePage1.java
index eba32bb7..ba19ef10 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumePage1.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumePage1.java
@@ -170,7 +170,7 @@ public class CreateVolumePage1 extends WizardPage {
 	private void createAccessControlLabel(Composite container) {
 		Label lblAccessControl = new Label(container, SWT.NONE);
 		lblAccessControl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-		lblAccessControl.setText("Access Control: ");
+		lblAccessControl.setText("Allow Access From: ");
 	}
 	
 	private void createCifsUserLabel(Composite container) {
@@ -267,23 +267,28 @@ public class CreateVolumePage1 extends WizardPage {
 		GridData typeComboData = new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1);
 		typeCombo.setLayoutData(typeComboData);
 		typeComboViewer.setContentProvider(new ArrayContentProvider());
-		typeComboViewer.setInput(Volume.VOLUME_TYPE.values());
-		typeCombo.select(VOLUME_TYPE.PLAIN_DISTRIBUTE.ordinal()); // default type = Plain Distribute
+		
+		VOLUME_TYPE[] volumeTypes = new VOLUME_TYPE[3];
+		volumeTypes[0] = VOLUME_TYPE.DISTRIBUTE;
+		volumeTypes[1] = VOLUME_TYPE.REPLICATE;
+		volumeTypes[2] = VOLUME_TYPE.STRIPE;
+		
+		typeComboViewer.setInput(volumeTypes);
+		typeCombo.select(0); // default type = Plain Distribute
 		typeComboViewer.setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
-				VOLUME_TYPE volumeType = (VOLUME_TYPE)element;
-				return Volume.getVolumeTypeStr(volumeType);
+				return Volume.getVolumeTypeStr((VOLUME_TYPE)element);
 			}
 		});
 		typeComboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
-				validateForm();				
+				validateForm();
 			}
 		});
 	}
-
+	
 	private void createTypeLabel(Composite container) {
 		Label lblType = new Label(container, SWT.NONE);
 		lblType.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
@@ -333,7 +338,9 @@ public class CreateVolumePage1 extends WizardPage {
 		
 		IStructuredSelection selection = (IStructuredSelection)typeComboViewer.getSelection();
 		volume.setVolumeType((VOLUME_TYPE)selection.getFirstElement());
-		
+		volume.setReplicaCount(Volume.DEFAULT_REPLICA_COUNT);
+		volume.setStripeCount(Volume.DEFAULT_STRIPE_COUNT);
+
 		volume.setTransportType(TRANSPORT_TYPE.ETHERNET); // Support only for Ethernet
 		Set<NAS_PROTOCOL> nasProtocols = new HashSet<Volume.NAS_PROTOCOL>();
 		nasProtocols.add(NAS_PROTOCOL.GLUSTERFS);
@@ -402,7 +409,7 @@ public class CreateVolumePage1 extends WizardPage {
 
 		VOLUME_TYPE volumeType = (VOLUME_TYPE) ((IStructuredSelection) typeComboViewer
 				.getSelection()).getFirstElement();
-		if (volumeType == VOLUME_TYPE.DISTRIBUTED_MIRROR && diskCount % 2 != 0) {
+		if (volumeType == VOLUME_TYPE.DISTRIBUTED_REPLICATE && diskCount % 2 != 0) {
 			setError("Mirror type volume requires bricks in multiples of two");
 		} else if (volumeType == VOLUME_TYPE.DISTRIBUTED_STRIPE && diskCount % 4 != 0) {
 			setError("Stripe type volume requires bricks in multiples of four");
@@ -417,10 +424,12 @@ public class CreateVolumePage1 extends WizardPage {
 		}
 		
 		if (!ValidationUtil.isValidAccessControl(accessControl)) {
-			setError("Access control list must be a comma separated list of IP addresses/Host names. Please enter a valid value!");
+			setError("Invalid IP address/Host name [" + ValidationUtil.getInvalidIpOrHostname(accessControl)
+					+ "]. Please enter a valid value!");
 		}
 	}
 	
+	
 	private void validateCifsUsers() {
 		if (btnCIFS.getSelection()) {
 			String cifsUserList = txtCifsUsers.getText().trim();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
index 45e97b75..45153190 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
@@ -201,7 +201,7 @@ public class VolumeSummaryView extends ViewPart {
 		infoLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.VERTICAL_ALIGN_CENTER, false, false, 2, 0));
 
 		// TODO: implement a logic to identify the corresponding glusterfs client download link
-		String message = "You can download gluster FS client from";
+		String message = "You can download GlusterFS client from";
 		String glusterFSDownloadlinkText = "here.";
 		final String glusterFSDownloadlink = "http://download.gluster.com/pub/gluster/glusterfs/";
 
@@ -245,7 +245,7 @@ public class VolumeSummaryView extends ViewPart {
 		createVolumeTypeField(section);
 
 		VOLUME_TYPE volumeType = volume.getVolumeType();
-		if (volumeType == VOLUME_TYPE.DISTRIBUTED_MIRROR) {
+		if (volumeType == VOLUME_TYPE.DISTRIBUTED_REPLICATE) {
 			createReplicaCountField(section);
 		}
 
@@ -286,7 +286,7 @@ public class VolumeSummaryView extends ViewPart {
 	}
 
 	private void createAccessControlField(Composite section) {
-		toolkit.createLabel(section, "Access Control: ", SWT.NONE);
+		toolkit.createLabel(section, "Allow Access From: ", SWT.NONE);
 		accessControlText = toolkit.createText(section, volume.getAccessControlList(), SWT.BORDER);
 
 		populateAccessControlText();
@@ -636,7 +636,12 @@ public class VolumeSummaryView extends ViewPart {
 	
 	private void updateBrickChanges(Volume volume) {
 		numberOfBricks.setText("" + volume.getNumOfBricks());
-		totalDiskSpace.setText("" + NumberUtil.formatNumber((getTotalDiskSpace() / 1024)));
+		Double replicaCount = 1d;
+		if (volume.getVolumeType() == VOLUME_TYPE.REPLICATE
+				|| volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_REPLICATE) {
+			replicaCount = (double) volume.getReplicaCount();
+		}
+		totalDiskSpace.setText("" + NumberUtil.formatNumber((getTotalDiskSpace() / 1024) / replicaCount));
 	}
 
 	private double getDiskSize(String serverName, String deviceName) {
@@ -674,7 +679,12 @@ public class VolumeSummaryView extends ViewPart {
 	private void createDiskSpaceField(Composite section) {
 		Label diskSpaceLabel = toolkit.createLabel(section, "Total Disk Space (GB): ", SWT.NONE);
 		diskSpaceLabel.setToolTipText("<b>bold</b>normal");
-		totalDiskSpace = toolkit.createLabel(section, "" + NumberUtil.formatNumber((getTotalDiskSpace() / 1024)), SWT.NONE);
+		Double replicaCount = 1d;
+		if (volume.getVolumeType() == VOLUME_TYPE.REPLICATE
+				|| volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_REPLICATE) {
+			replicaCount = (double) volume.getReplicaCount();
+		}
+		totalDiskSpace = toolkit.createLabel(section, "" + NumberUtil.formatNumber((getTotalDiskSpace() / 1024)/ replicaCount ), SWT.NONE);
 		toolkit.createLabel(section, "", SWT.NONE); // dummy
 	}
 
@@ -742,8 +752,9 @@ public class VolumeSummaryView extends ViewPart {
 		}
 
 		if (!ValidationUtil.isValidAccessControl(accessControlText.getText())) {
-			errDecoration
-					.setDescriptionText("Access control list must be a comma separated list of IP addresses/Host names. Please enter a valid value!");
+			errDecoration.setDescriptionText("Invalid IP address/Host name ["
+					+ ValidationUtil.getInvalidIpOrHostname(accessControlText.getText())
+					+ "]. Please enter a valid value!");
 			errDecoration.show();
 		}
 	}
@@ -772,4 +783,5 @@ public class VolumeSummaryView extends ViewPart {
 		validateCifsUsers();
 		return true;
 	}
+	
 }
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeLogsPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeLogsPage.java
index 87c319ef..e573229c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeLogsPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeLogsPage.java
@@ -161,8 +161,8 @@ public class VolumeLogsPage extends Composite {
 	}
 
 	private void createSearchButton(Composite composite) {
-		Button btnGo = toolkit.createButton(composite, "&Go", SWT.NONE);
-		btnGo.setBounds(615, 55, 50, 30);
+		Button btnGo = toolkit.createButton(composite, "&Fetch Logs", SWT.NONE);
+		btnGo.setBounds  (615, 55, 75, 30);
 		btnGo.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {