Volume logs view disk to brick code changes and default filter set to ALL.

3 files changed, 13 insertions, 9 deletions

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 cf12b0d7..dae07dbc 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
@@ -282,4 +282,12 @@ public class Volume extends Entity {
 		return StringUtil.filterString(getName() + getVolumeTypeStr() + getTransportTypeStr() + getStatusStr()
 				+ getNumOfDisks(), filterString, caseSensitive);
 	}
+	
+	public List<String> getBrickDirectories() {
+		List<String> brickDirectories = new ArrayList<String>();
+		for(Brick brick : getBricks()) {
+			brickDirectories.add(brick.getQualifiedName());
+		}
+		return brickDirectories;
+	}
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java
index ffbea8c1..8f067183 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java
@@ -324,7 +324,7 @@ public class VolumeLogsPage extends Composite {
 	private void createDisksCombo(Composite composite) {
 		disksCombo = new Combo(composite, SWT.READ_ONLY);
 		disksCombo.setBounds(365, 15, 100, 20);
-		disksCombo.setItems(volume.getBricks().toArray(new String[0]));
+		disksCombo.setItems( volume.getBrickDirectories().toArray(new String[0]));
 		disksCombo.add(CoreConstants.ALL, 0);
 		toolkit.adapt(disksCombo);
 		toolkit.paintBordersFor(disksCombo);
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
index f84f3ef6..84980851 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
@@ -407,7 +407,7 @@ public class VolumesResource {
 	@GET
 	@Path("{" + PATH_PARAM_VOLUME_NAME + "}/" + SUBRESOURCE_LOGS)
 	public LogMessageListResponse getLogs(@PathParam(PATH_PARAM_VOLUME_NAME) String volumeName,
-			@QueryParam(QUERY_PARAM_DISK_NAME) String diskName, @QueryParam(QUERY_PARAM_LOG_SEVERITY) String severity,
+			@QueryParam(QUERY_PARAM_DISK_NAME) String brickName, @QueryParam(QUERY_PARAM_LOG_SEVERITY) String severity,
 			@QueryParam(QUERY_PARAM_FROM_TIMESTAMP) String fromTimestamp,
 			@QueryParam(QUERY_PARAM_TO_TIMESTAMP) String toTimestamp,
 			@QueryParam(QUERY_PARAM_LINE_COUNT) Integer lineCount, @QueryParam(QUERY_PARAM_DOWNLOAD) Boolean download) {
@@ -415,11 +415,12 @@ public class VolumesResource {
 
 		try {
 			Volume volume = getVolume(volumeName);
-			if (diskName == null || diskName.isEmpty()) {
+			if (brickName == null || brickName.isEmpty() || brickName.equals(CoreConstants.ALL)) {
 				logMessages = getLogsForAllBricks(volume, lineCount);
 			} else {
 				// fetch logs for given brick of the volume
-				logMessages = getBrickLogs(volume, getBrickForDisk(volume, diskName), lineCount);
+				// logMessages = getBrickLogs(volume, getBrickForDisk(volume, brickName), lineCount);
+				logMessages = getBrickLogs(volume, brickName, lineCount);
 			}
 		} catch (Exception e) {
 			return new LogMessageListResponse(new Status(e), null);
@@ -504,11 +505,6 @@ public class VolumesResource {
 		return glusterUtil.migrateDisk(volumeName, diskFrom, diskTo, operation);
 	}
 
-	private String getBrickForDisk(Volume volume, String diskName) {
-		int index = volume.getDisks().indexOf(diskName);
-		return volume.getBricks().get(index).getBrickDirectory();
-	}
-
 	private String getDiskForBrick(Volume volume, String brickName) {
 		int index = volume.getBricks().indexOf(brickName);
 		return volume.getDisks().get(index);