Demo feedback changes on volumes

3 files changed, 27 insertions, 11 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java
index d162ec38..2139bbd7 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java
@@ -117,17 +117,17 @@ public class GlusterDummyModel {
 	private void initializeVolumes(Cluster cluster) {
 		List<Volume> volumes = new ArrayList<Volume>();
 
-		volume1 = addVolume(volumes, "Volume1", cluster, VOLUME_TYPE.PLAIN_DISTRIBUTE, TRANSPORT_TYPE.ETHERNET,
+		volume1 = addVolume(volumes, "Volume1", cluster, VOLUME_TYPE.DISTRIBUTE, TRANSPORT_TYPE.ETHERNET,
 				VOLUME_STATUS.ONLINE);
 
-		volume2 = addVolume(volumes, "Volume2", cluster, VOLUME_TYPE.PLAIN_DISTRIBUTE, TRANSPORT_TYPE.ETHERNET,
+		volume2 = addVolume(volumes, "Volume2", cluster, VOLUME_TYPE.DISTRIBUTE, TRANSPORT_TYPE.ETHERNET,
 				VOLUME_STATUS.ONLINE);
 
-		volume3 = addVolume(volumes, "Volume3", cluster, VOLUME_TYPE.DISTRIBUTED_MIRROR, TRANSPORT_TYPE.ETHERNET,
+		volume3 = addVolume(volumes, "Volume3", cluster, VOLUME_TYPE.DISTRIBUTED_REPLICATE, TRANSPORT_TYPE.ETHERNET,
 				VOLUME_STATUS.OFFLINE);
 		volume3.setReplicaCount(2);
 
-		volume4 = addVolume(volumes, "Volume4", cluster, VOLUME_TYPE.PLAIN_DISTRIBUTE, TRANSPORT_TYPE.ETHERNET,
+		volume4 = addVolume(volumes, "Volume4", cluster, VOLUME_TYPE.DISTRIBUTE, TRANSPORT_TYPE.ETHERNET,
 				VOLUME_STATUS.ONLINE);
 
 		volume5 = addVolume(volumes, "Volume5", cluster, VOLUME_TYPE.DISTRIBUTED_STRIPE, TRANSPORT_TYPE.INFINIBAND,
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
index c3b73c27..2ce1ea44 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
@@ -44,9 +44,9 @@ public class Volume extends Entity {
 	};
 
 	public enum VOLUME_TYPE {
-		PLAIN_DISTRIBUTE, DISTRIBUTED_MIRROR, DISTRIBUTED_STRIPE
+		DISTRIBUTE, REPLICATE, DISTRIBUTED_REPLICATE, STRIPE, DISTRIBUTED_STRIPE
 	};
-
+	
 	public enum TRANSPORT_TYPE {
 		ETHERNET, INFINIBAND
 	};
@@ -62,8 +62,9 @@ public class Volume extends Entity {
 	public static final String OPTION_AUTH_ALLOW = "auth.allow";
 	public static final String OPTION_NFS_DISABLE = "nfs.disable";
 
-	private static final String[] VOLUME_TYPE_STR = new String[] { "Plain Distribute", "Distributed Mirror",
-			"Distributed Stripe" };
+	private static final String[] VOLUME_TYPE_STR = new String[] { "Distribute", "Replicate", "Distributed Replicate",
+			"Stripe", "Distributed Stripe" };
+
 	private static final String[] TRANSPORT_TYPE_STR = new String[] { "Ethernet", "Infiniband" };
 	private static final String[] STATUS_STR = new String[] { "Online", "Offline" };
 	private static final String[] NAS_PROTOCOL_STR = new String[] { "Gluster", "NFS", "CIFS" };
@@ -87,7 +88,7 @@ public class Volume extends Entity {
 	public String getVolumeTypeStr() {
 		return getVolumeTypeStr(getVolumeType());
 	}
-
+	
 	public static String getVolumeTypeStr(VOLUME_TYPE volumeType) {
 		return VOLUME_TYPE_STR[volumeType.ordinal()];
 	}
@@ -122,7 +123,7 @@ public class Volume extends Entity {
 		if (volumeType == VOLUME_TYPE.DISTRIBUTED_STRIPE) {
 			setReplicaCount(0);
 			setStripeCount(DEFAULT_STRIPE_COUNT);
-		} else if (volumeType == VOLUME_TYPE.DISTRIBUTED_MIRROR) {
+		} else if (volumeType == VOLUME_TYPE.DISTRIBUTED_REPLICATE) {
 			setReplicaCount(DEFAULT_REPLICA_COUNT);
 			setStripeCount(0);
 		} else {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java
index b1ceb478..df0b749a 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java
@@ -7,13 +7,28 @@ public class ValidationUtil {
 	// Access control may contains IP with wild card(*), hostname and/or multiple ip/hostnames
 	public static boolean isValidAccessControl(String ac) {
 		String access[] = ac.split(",");
+		String ip;
 		boolean isValidAccessControl = true;
 		for (int i = 0; i < access.length && isValidAccessControl; i++) {
-			isValidAccessControl = (isValidIpWithWC(access[i]) || isValidHostName(access[i]));
+			ip = access[i].trim();
+			isValidAccessControl = (isValidIpWithWC(ip) || isValidHostName(ip));
 		}
 		return isValidAccessControl;
 	}
 
+	public static String getInvalidIpOrHostname(String ac) {
+		String access[] = ac.split(",");
+		String ip;
+		boolean isValidAccessControl = true;
+		for (int i = 0; i < access.length && isValidAccessControl; i++) {
+			ip = access[i].trim();
+			if (!(isValidIpWithWC(ip) || isValidHostName(ip))) {
+				return access[i];
+			}
+		}
+		return "";
+	}
+	
 	public static boolean isValidIpWithWC(String ip) {
 		String ipAddress[] = ip.split("\\.");
 		boolean isValid = true;