Merge remote branch 'upstream/master'

3 files changed, 21 insertions, 4 deletions

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 5db3926b..443b1853 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
@@ -74,6 +74,7 @@ public class GlusterUtil {
 	private static final GlusterCoreUtil glusterCoreUtil = new GlusterCoreUtil();
 	
 	private static final String INITIALIZE_DISK_STATUS_SCRIPT = "get_format_device_status.py";
+	private static final String BRICK_STATUS_SCRIPT = "get_brick_status.py";
 
 	@Autowired
 	private SshUtil sshUtil;
@@ -422,9 +423,12 @@ public class GlusterUtil {
 	// Do not throw exception, Gracefully handle as Offline brick. 
 	private BRICK_STATUS getBrickStatus(String serverName, String volumeName, String brick){
 		try {
-			ProcessResult output = getSshUtil().executeRemote(serverName, "get_brick_status.py" + " " + volumeName + " " + brick);
-
-			if (output.isSuccess() && output.getOutput().equals(CoreConstants.ONLINE)) {
+			Object output = serverUtil.executeScriptOnServer(true, serverName, BRICK_STATUS_SCRIPT + " " + volumeName + " " + brick, String.class);
+			if(output instanceof Status) {
+				// script failed. throw exception.
+				throw new GlusterRuntimeException(((Status)output).toString());
+			}
+			if (((String)output).equals(CoreConstants.ONLINE)) {
 				return BRICK_STATUS.ONLINE;
 			} else {
 				return BRICK_STATUS.OFFLINE;
@@ -523,6 +527,16 @@ public class GlusterUtil {
 				}
 			}
 		}
+		
+		// TODO: Execute the python script to find whether the volume is cifs enabled or not 
+		boolean isCifsEnabled = false;
+		List<String> cifsUsers = new ArrayList<String>();
+		if(isCifsEnabled) {
+			volume.enableCifs();
+			volume.setCifsUsers(cifsUsers);
+		} else {
+			volume.disableCifs();
+		}
 
 		if (volume != null) {// Adding the last volume parsed
 			volumes.add(volume);
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
index 2a39ea87..9ec49a2f 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
@@ -748,6 +748,9 @@ public class GlusterDataModelManager {
 			for(Brick brick : volume.getBricks()) {
 				brick.setStatus(BRICK_STATUS.OFFLINE);
 			}
+		} else {
+			Volume newVolume = new VolumesClient().getVolume(volume.getName()); //Getting latest brick info
+			updateBricks(volume, volume.getBricks(), newVolume.getBricks());
 		}
 		
 		for (ClusterListener listener : listeners) {
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 8b1984a2..62939211 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
@@ -547,7 +547,7 @@ public class VolumeSummaryView extends ViewPart {
 		});
 		
 		// CIFS checkbox
-		cifsCheckbox = createCheckbox(nasProtocolsComposite, "CIFS", false, true);
+		cifsCheckbox = createCheckbox(nasProtocolsComposite, "CIFS", volume.isCifsEnable(), true);
 		cifsCheckboxListner(cifsCheckbox);
 		
 		toolkit.createLabel(section, "", SWT.NONE); // dummy