Story #56: CIFS Feature

8 files changed, 32 insertions, 15 deletions

diff --git a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/TestFileUtil.java b/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/TestFileUtil.java
index 699346f7..f562a53c 100644
--- a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/TestFileUtil.java
+++ b/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/TestFileUtil.java
@@ -25,11 +25,9 @@ import static org.junit.Assert.assertTrue;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.io.OutputStreamWriter;
 
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
index edf3bbe4..45cf5980 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
@@ -54,6 +54,7 @@ public class RESTConstants {
 	public static final String TASK_REBALANCE_START = "rebalanceStart";
 	public static final String TASK_REBALANCE_STATUS = "rebalanceStatus";
 	public static final String TASK_REBALANCE_STOP = "rebalanceStop";
+	public static final String TASK_CIFS_CONFIG = "cifsConfig";
 
 	public static final String FORM_PARAM_VOLUME_NAME = "name";
 	public static final String FORM_PARAM_VOLUME_TYPE = "volumeType";
@@ -64,6 +65,8 @@ public class RESTConstants {
 	public static final String FORM_PARAM_ACCESS_PROTOCOLS = "accessProtocols";
 	public static final String FORM_PARAM_VOLUME_OPTIONS = "options";
 	public static final String FORM_PARAM_FSTYPE = "fsType";
+	public static final String FORM_PARAM_CIFS_ENABLE = "enableCifs";
+	public static final String FORM_PARAM_CIFS_USERS = "cifsUsers";
 
 	public static final String FORM_PARAM_CLUSTER_NAME = "clusterName";
 	public static final String FORM_PARAM_SERVER_NAME = "serverName";
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java
index 92943074..9c7ac80b 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java
@@ -19,7 +19,6 @@
 package com.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 
 import com.gluster.storage.management.core.utils.StringUtil;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java
index 701fe426..fc824db2 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java
@@ -20,6 +20,7 @@ package com.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+
 import com.gluster.storage.management.core.utils.ProcessResult;
 
 @XmlRootElement(name = "status")
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 0cb6e972..2c3bd2ba 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
@@ -52,7 +52,7 @@ public class Volume extends Entity {
 	};
 
 	public enum NAS_PROTOCOL {
-		GLUSTERFS, NFS
+		GLUSTERFS, NFS, CIFS
 	};
 
 	
@@ -66,7 +66,7 @@ public class Volume extends Entity {
 			"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" };
+	private static final String[] NAS_PROTOCOL_STR = new String[] { "Gluster", "NFS", "CIFS" };
 
 	private VOLUME_TYPE volumeType;
 	private TRANSPORT_TYPE transportType;
@@ -75,6 +75,7 @@ public class Volume extends Entity {
 	private int stripeCount;
 	private VolumeOptions options = new VolumeOptions();
 	private List<Brick> bricks = new ArrayList<Brick>();
+	private List<String> cifsUsers;
 
 	public Volume() {
 	}
@@ -253,6 +254,31 @@ public class Volume extends Entity {
 		nasProtocols.remove(NAS_PROTOCOL.NFS);
 		setOption(OPTION_NFS_DISABLE, GlusterConstants.ON);
 	}
+	
+	public void enableCifs() {
+		nasProtocols.add(NAS_PROTOCOL.CIFS);
+	}
+	
+	public void disableCifs() {
+		nasProtocols.remove(NAS_PROTOCOL.CIFS);
+	}
+	
+	public boolean isCifsEnable() {
+		if (nasProtocols.contains(NAS_PROTOCOL.CIFS)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
+	public void setCifsUsers(List<String> cifsUsers) {
+		this.cifsUsers = cifsUsers;
+	}
+
+	public List<String> getCifsUsers() {
+		return cifsUsers;
+	}
+
 
 	public Volume(String name, Entity parent, VOLUME_TYPE volumeType, TRANSPORT_TYPE transportType, VOLUME_STATUS status) {
 		super(name, parent);
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOptions.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOptions.java
index 4040a4e7..edeec768 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOptions.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOptions.java
@@ -19,15 +19,10 @@
 package com.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/GlusterServerListResponse.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/GlusterServerListResponse.java
index f375905c..868e2fc2 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/GlusterServerListResponse.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/GlusterServerListResponse.java
@@ -24,12 +24,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 
 import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Status;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java
index a0d90634..601a3790 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java
@@ -20,10 +20,8 @@ package com.gluster.storage.management.core.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.UUID;
 
 import com.gluster.storage.management.core.constants.CoreConstants;