From 1108eb463a0f8812ea60df583304724a0eb77e41 Mon Sep 17 00:00:00 2001
From: Dhandapani <dhandapani@gluster.com>
Date: Tue, 9 Aug 2011 18:00:23 +0530
Subject: Bug 3357 - Adding CIFS user to volume fails - Fix

---
 .../management/gateway/services/VolumeService.java     |  2 --
 .../storage/management/gateway/utils/GlusterUtil.java  | 18 ------------------
 2 files changed, 20 deletions(-)

(limited to 'src')

diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
index 898cc770..0005a5a9 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
@@ -205,10 +205,8 @@ public class VolumeService {
 	private void fetchVolumeCifsUsers(String clusterName, Volume volume) {
 		List<String> users = new ArrayList<String>();
 		try {
-			File file = createOnlineServerList(clusterName);
 			ProcessResult result = serverUtil
 					.executeGlusterScript(true, VOLUME_GET_CIFS_USERS_SCRIPT, volume.getName());
-			file.delete();
 			if (!result.isSuccess()) {
 				throw new GlusterRuntimeException(result.toString());
 			}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
index 1cbdd716..db4bd4bd 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
@@ -534,27 +534,9 @@ public class GlusterUtil {
 			volumes.add(volume);
 		}
 		
-		updateCifsInfo(volumes);
-
 		return volumes;
 	}
 
-	private void updateCifsInfo(List<Volume> volumes) {
-		for (Volume volume : volumes) {
-			boolean isCifsEnabled = false;
-			
-			// TODO: Call python script to check if CIFS is enabled on the volume
-			
-			List<String> cifsUsers = new ArrayList<String>();
-			if (isCifsEnabled) {
-				volume.enableCifs();
-				volume.setCifsUsers(cifsUsers);
-			} else {
-				volume.disableCifs();
-			}
-		}
-	}
-
 	public void addBricks(String volumeName, List<String> bricks, String knownServer) {
 		StringBuilder command = new StringBuilder("gluster volume add-brick " + volumeName);
 		for (String brickDir : bricks) {
-- 
cgit