From 79b8ad606bcd3aaf241d190d89a6d6b2def02ddb Mon Sep 17 00:00:00 2001 From: Dhandapani Date: Wed, 15 Jun 2011 15:41:41 +0530 Subject: UI Changes: Size conversion from MB to GB --- .../storage/management/core/model/Volume.java | 4 +++ .../management/gui/BrickTableLabelProvider.java | 27 ++++++++------------ .../management/gui/DiskTableLabelProvider.java | 20 ++++++++------- .../gui/GlusterServerTableLabelProvider.java | 6 ++--- .../gui/ServerDiskTableLabelProvider.java | 24 +++++++++--------- .../management/gui/ServerTableLabelProvider.java | 26 +++++++++++-------- .../management/gui/VolumeTableLabelProvider.java | 2 +- .../management/gui/views/ClusterSummaryView.java | 4 +-- .../management/gui/views/DiscoveredServerView.java | 4 +-- .../gui/views/GlusterServerSummaryView.java | 8 +++--- .../management/gui/views/VolumeSummaryView.java | 29 +++++++++++++++++++--- .../gui/views/pages/GlusterServersPage.java | 6 ++--- .../management/gui/views/pages/VolumesPage.java | 4 +-- 13 files changed, 94 insertions(+), 70 deletions(-) (limited to 'src') 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 a595a973..399192f4 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 @@ -100,6 +100,10 @@ public class Volume extends Entity { public int getNumOfDisks() { return disks.size(); } + + public int getNumOfBricks() { + return bricks.size(); + } public VOLUME_TYPE getVolumeType() { return volumeType; diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java index 17e7c7ba..763dac2a 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java @@ -35,14 +35,14 @@ public class BrickTableLabelProvider extends TableLabelProviderAdapter { @Override public Image getColumnImage(Object element, int columnIndex) { - + if (!(element instanceof Brick)) { return null; } Brick brick = (Brick) element; Disk disk = GlusterDataModelManager.getInstance().getDiskDetails(brick.getDiskName()); - + if (columnIndex == DISK_TABLE_COLUMN_INDICES.STATUS.ordinal()) { DISK_STATUS status = disk.getStatus(); switch (status) { @@ -62,25 +62,17 @@ public class BrickTableLabelProvider extends TableLabelProviderAdapter { return null; } - private String getDiskSpaceInUse(Disk disk) { - if (disk.isReady() && disk.getSpaceInUse() != null) { - return NumberUtil.formatNumber(disk.getSpaceInUse()); - } else { - return "NA"; - } - } - private String getDiskFreeSpace(Disk disk) { if (disk.isReady() && disk.getFreeSpace() != null) { - return NumberUtil.formatNumber(disk.getFreeSpace()); + return NumberUtil.formatNumber((disk.getFreeSpace() / 1024)); } else { return "NA"; } } - - private String getDiskSpace( Disk disk) { + + private String getDiskSpace(Disk disk) { if (disk.isReady() && disk.getSpace() != null && disk.getSpace() != 0.0) { - return NumberUtil.formatNumber(disk.getSpace()); + return NumberUtil.formatNumber((disk.getSpace() / 1024)); } else { return "NA"; } @@ -96,8 +88,9 @@ public class BrickTableLabelProvider extends TableLabelProviderAdapter { Disk disk = GlusterDataModelManager.getInstance().getDiskDetails(brick.getDiskName()); return (columnIndex == BRICK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? brick.getServerName() : columnIndex == BRICK_TABLE_COLUMN_INDICES.BRICK.ordinal() ? brick.getBrickDirectory() - : columnIndex == BRICK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? getDiskFreeSpace(disk) - : columnIndex == BRICK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? getDiskSpace(disk) - : columnIndex == BRICK_TABLE_COLUMN_INDICES.STATUS.ordinal() ? brick.getStatusStr() : "Invalid"); + : columnIndex == BRICK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? getDiskFreeSpace(disk) + : columnIndex == BRICK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? getDiskSpace(disk) + : columnIndex == BRICK_TABLE_COLUMN_INDICES.STATUS.ordinal() ? brick + .getStatusStr() : "Invalid"); } } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java index 539b70d7..d2f265b5 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java @@ -34,7 +34,7 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter { @Override public Image getColumnImage(Object element, int columnIndex) { - + if (!(element instanceof Disk)) { return null; } @@ -42,7 +42,7 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter { // Brick brick = (Brick) element; // Disk disk = GlusterDataModelManager.getInstance().getDisk(brick.getDiskName()); Disk disk = (Disk) element; - + if (columnIndex == DISK_TABLE_COLUMN_INDICES.STATUS.ordinal()) { DISK_STATUS status = disk.getStatus(); switch (status) { @@ -74,15 +74,15 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter { if (disk.hasErrors() || disk.isUninitialized()) { return "NA"; } else { - return NumberUtil.formatNumber(disk.getFreeSpace()); + return NumberUtil.formatNumber((disk.getFreeSpace() / 1024)); } } - + private String getTotalDiskSpace(Disk disk) { if (disk.hasErrors() || disk.isUninitialized()) { return "NA"; } else { - return NumberUtil.formatNumber(disk.getSpace()); + return NumberUtil.formatNumber((disk.getSpace() / 1024)); } } @@ -95,9 +95,11 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter { Disk disk = (Disk) element; return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServerName() : columnIndex == DISK_TABLE_COLUMN_INDICES.DISK.ordinal() ? disk.getName() - : columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? getDiskFreeSpace(disk) - : columnIndex == DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? getTotalDiskSpace(disk) - // : columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal() ? getDiskSpaceInUse(disk) - : columnIndex == DISK_TABLE_COLUMN_INDICES.STATUS.ordinal() ? glusterDataModelManager.getDiskStatus(disk) : "Invalid"); + : columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? getDiskFreeSpace(disk) + : columnIndex == DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? getTotalDiskSpace(disk) + // : columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal() ? + // getDiskSpaceInUse(disk) + : columnIndex == DISK_TABLE_COLUMN_INDICES.STATUS.ordinal() ? glusterDataModelManager + .getDiskStatus(disk) : "Invalid"); } } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java index 03b2d978..ac82f2c6 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java @@ -67,11 +67,11 @@ public class GlusterServerTableLabelProvider extends TableLabelProviderAdapter { // : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.PREFERRED_NETWORK.ordinal() ? server.getPreferredNetworkInterface().getName() : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.NUM_OF_CPUS.ordinal() ? "" + server.getNumOfCPUs() //: columnIndex == SERVER_DISK_TABLE_COLUMN_INDICES.CPU_USAGE.ordinal() ? "" + server.getCpuUsage() - : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.TOTAL_MEMORY.ordinal() ? "" + server.getTotalMemory() + : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.TOTAL_MEMORY.ordinal() ? "" + NumberUtil.formatNumber((server.getTotalMemory() / 1024)) //: columnIndex == SERVER_DISK_TABLE_COLUMN_INDICES.MEMORY_IN_USE.ordinal() ? "" + server.getMemoryInUse() - : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.TOTAL_DISK_SPACE.ordinal() ? NumberUtil.formatNumber(server.getTotalDiskSpace()) + : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.TOTAL_FREE_SPACE.ordinal() ? NumberUtil.formatNumber((server.getFreeDiskSpace() / 1024)) : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.IP_ADDRESSES.ordinal() ? server.getIpAddressesAsString() - : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.AVAILABLE_DISK_SPACE.ordinal() ? NumberUtil.formatNumber(server.getFreeDiskSpace()) + : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.TOTAL_DISK_SPACE.ordinal() ? NumberUtil.formatNumber((server.getTotalDiskSpace() / 1024)) : "Invalid"); } } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java index 80625779..f0e65edc 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java @@ -32,13 +32,13 @@ import com.gluster.storage.management.gui.views.pages.ServerDisksPage.SERVER_DIS public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter { private GUIHelper guiHelper = GUIHelper.getInstance(); private GlusterDataModelManager glusterDataModelManager = GlusterDataModelManager.getInstance(); - + @Override public Image getColumnImage(Object element, int columnIndex) { if (!(element instanceof Disk)) { return null; } - + Disk disk = (Disk) element; if (columnIndex == SERVER_DISK_TABLE_COLUMN_INDICES.STATUS.ordinal()) { DISK_STATUS status = disk.getStatus(); @@ -59,23 +59,22 @@ public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter { return null; } - private String getDiskFreeSpace(Disk disk) { if (disk.hasErrors() || disk.isUninitialized()) { return "NA"; } else { - return NumberUtil.formatNumber(disk.getFreeSpace()); + return NumberUtil.formatNumber((disk.getFreeSpace() / 1024)); } } - + private String getTotalDiskSpace(Disk disk) { if (disk.hasErrors() || disk.isUninitialized()) { return "NA"; } else { - return NumberUtil.formatNumber(disk.getSpace()); + return NumberUtil.formatNumber((disk.getSpace() / 1024)); } } - + @Override public String getColumnText(Object element, int columnIndex) { if (!(element instanceof Disk)) { @@ -84,10 +83,11 @@ public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter { Disk disk = (Disk) element; String columnText = (columnIndex == SERVER_DISK_TABLE_COLUMN_INDICES.DISK.ordinal() ? disk.getName() - : columnIndex == SERVER_DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? getDiskFreeSpace(disk) - : columnIndex == SERVER_DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? getTotalDiskSpace(disk) - : columnIndex == SERVER_DISK_TABLE_COLUMN_INDICES.STATUS.ordinal() ? glusterDataModelManager.getDiskStatus(disk) // disk.getStatusStr() - : "Invalid"); - return ((columnText == null || columnText.trim().equals("")) ? CoreConstants.NA : columnText); + : columnIndex == SERVER_DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? getDiskFreeSpace(disk) + : columnIndex == SERVER_DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? getTotalDiskSpace(disk) + : columnIndex == SERVER_DISK_TABLE_COLUMN_INDICES.STATUS.ordinal() ? glusterDataModelManager + .getDiskStatus(disk) // disk.getStatusStr() + : "Invalid"); + return ((columnText == null || columnText.trim().equals("")) ? CoreConstants.NA : columnText); } } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerTableLabelProvider.java index 6ec446cc..2bc8ff11 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerTableLabelProvider.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerTableLabelProvider.java @@ -18,7 +18,6 @@ *******************************************************************************/ package com.gluster.storage.management.gui; - import com.gluster.storage.management.core.model.Server; import com.gluster.storage.management.core.utils.NumberUtil; import com.gluster.storage.management.gui.utils.GUIHelper; @@ -26,7 +25,7 @@ import com.gluster.storage.management.gui.views.pages.ServersPage.SERVER_TABLE_C public class ServerTableLabelProvider extends TableLabelProviderAdapter { private GUIHelper guiHelper = GUIHelper.getInstance(); - + @Override public String getColumnText(Object element, int columnIndex) { if (!(element instanceof Server)) { @@ -35,14 +34,19 @@ public class ServerTableLabelProvider extends TableLabelProviderAdapter { Server server = (Server) element; return (columnIndex == SERVER_TABLE_COLUMN_INDICES.NAME.ordinal() ? server.getName() - : columnIndex == SERVER_TABLE_COLUMN_INDICES.IP_ADDRESSES.ordinal() ? server.getIpAddressesAsString() - : columnIndex == SERVER_TABLE_COLUMN_INDICES.NUM_OF_DISKS.ordinal() ? "" + server.getNumOfDisks() - : columnIndex == SERVER_TABLE_COLUMN_INDICES.TOTAL_DISK_SPACE.ordinal() ? NumberUtil.formatNumber(server.getTotalDiskSpace()) -// : columnIndex == SERVER_TABLE_COLUMN_INDICES.NUM_OF_CPUS.ordinal() ? "" + server.getNumOfCPUs() -// : columnIndex == SERVER_TABLE_COLUMN_INDICES.CPU_USAGE.ordinal() ? "" + server.getCpuUsage() -// : columnIndex == SERVER_TABLE_COLUMN_INDICES.TOTAL_MEMORY.ordinal() ? "" + server.getTotalMemory() -// : columnIndex == SERVER_TABLE_COLUMN_INDICES.MEMORY_IN_USE.ordinal() ? "" + server.getMemoryInUse() -// : columnIndex == SERVER_TABLE_COLUMN_INDICES.DISK_SPACE_IN_USE.ordinal() ? "" + server.getDiskSpaceInUse() - : "Invalid"); + : columnIndex == SERVER_TABLE_COLUMN_INDICES.IP_ADDRESSES.ordinal() ? server.getIpAddressesAsString() + : columnIndex == SERVER_TABLE_COLUMN_INDICES.NUM_OF_DISKS.ordinal() ? "" + + server.getNumOfDisks() : columnIndex == SERVER_TABLE_COLUMN_INDICES.TOTAL_DISK_SPACE + .ordinal() ? NumberUtil.formatNumber((server.getTotalDiskSpace() / 1024)) + // : columnIndex == SERVER_TABLE_COLUMN_INDICES.NUM_OF_CPUS.ordinal() ? "" + + // server.getNumOfCPUs() + // : columnIndex == SERVER_TABLE_COLUMN_INDICES.CPU_USAGE.ordinal() ? "" + server.getCpuUsage() + // : columnIndex == SERVER_TABLE_COLUMN_INDICES.TOTAL_MEMORY.ordinal() ? "" + + // server.getTotalMemory() + // : columnIndex == SERVER_TABLE_COLUMN_INDICES.MEMORY_IN_USE.ordinal() ? "" + + // server.getMemoryInUse() + // : columnIndex == SERVER_TABLE_COLUMN_INDICES.DISK_SPACE_IN_USE.ordinal() ? "" + + // server.getDiskSpaceInUse() + : "Invalid"); } } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeTableLabelProvider.java index b0f0c8d0..0da1e903 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeTableLabelProvider.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeTableLabelProvider.java @@ -76,7 +76,7 @@ public class VolumeTableLabelProvider implements ITableLabelProvider { return (columnIndex == VOLUME_TABLE_COLUMN_INDICES.NAME.ordinal() ? volume.getName() : columnIndex == VOLUME_TABLE_COLUMN_INDICES.VOLUME_TYPE.ordinal() ? volume.getVolumeTypeStr() : columnIndex == VOLUME_TABLE_COLUMN_INDICES.TRANSPORT_TYPE.ordinal() ? volume.getTransportTypeStr() - : columnIndex == VOLUME_TABLE_COLUMN_INDICES.NUM_OF_DISKS.ordinal() ? "" + volume.getNumOfDisks() + : columnIndex == VOLUME_TABLE_COLUMN_INDICES.NUM_OF_BRICKS.ordinal() ? "" + volume.getNumOfBricks() : columnIndex == VOLUME_TABLE_COLUMN_INDICES.VOLUME_STATUS.ordinal() ? volume.getStatusStr() : "Invalid"); } } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java index cc5c2b63..e1e25e51 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java @@ -159,8 +159,8 @@ public class ClusterSummaryView extends ViewPart { } private void createDiskSpaceChart(FormToolkit toolkit, Composite section, Double[] values) { - String[] categories = new String[] { "Used Space: " + NumberUtil.formatNumber(values[0]) + " GB", - "Free Space: " + NumberUtil.formatNumber(values[1]) + " GB"}; + String[] categories = new String[] { "Used Space: " + NumberUtil.formatNumber((values[0] / 1024)) + " GB", + "Free Space: " + NumberUtil.formatNumber((values[1] / 1024)) + " GB"}; PieChartViewerComposite chartViewerComposite = new PieChartViewerComposite(section, SWT.NONE, categories, values); diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/DiscoveredServerView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/DiscoveredServerView.java index e13912c6..fdb4c53c 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/DiscoveredServerView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/DiscoveredServerView.java @@ -62,10 +62,10 @@ public class DiscoveredServerView extends ViewPart { toolkit.createLabel(section, "" + server.getNumOfCPUs(), SWT.NONE); toolkit.createLabel(section, "Total Memory (GB): ", SWT.NONE); - toolkit.createLabel(section, "" + server.getTotalMemory(), SWT.NONE); + toolkit.createLabel(section, "" + (server.getTotalMemory() / 1024), SWT.NONE); toolkit.createLabel(section, "Total Disk Space (GB): ", SWT.NONE); - toolkit.createLabel(section, "" + NumberUtil.formatNumber(server.getTotalDiskSpace()), SWT.NONE); + toolkit.createLabel(section, "" + NumberUtil.formatNumber((server.getTotalDiskSpace() / 1024)), SWT.NONE); } private void createSections(Composite parent) { diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java index 8d3217f1..77e902ab 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java @@ -115,8 +115,8 @@ public class GlusterServerSummaryView extends ViewPart { memoryUsageBar.setMinimum(0); memoryUsageBar.setMaximum((int) Math.round(server.getTotalMemory())); memoryUsageBar.setSelection((int) Math.round(server.getMemoryInUse())); - memoryUsageBar.setToolTipText("Total: " + NumberUtil.formatNumber(server.getTotalMemory()) + "GB, In Use: " - + NumberUtil.formatNumber(server.getMemoryInUse()) + "GB"); + memoryUsageBar.setToolTipText("Total: " + NumberUtil.formatNumber((server.getTotalMemory()/1024)) + "GB, In Use: " + + NumberUtil.formatNumber((server.getMemoryInUse()/1024)) + "GB"); // toolkit.createLabel(section, "Memory Usage: ", SWT.NONE); // final CoolProgressBar bar = new CoolProgressBar(section,SWT.HORIZONTAL, @@ -137,8 +137,8 @@ public class GlusterServerSummaryView extends ViewPart { diskUsageBar.setMinimum(0); diskUsageBar.setMaximum((int) Math.round(server.getTotalDiskSpace())); diskUsageBar.setSelection((int) Math.round(server.getDiskSpaceInUse())); - diskUsageBar.setToolTipText("Total: " + NumberUtil.formatNumber(server.getTotalDiskSpace()) - + "GB, In Use: " + NumberUtil.formatNumber(server.getDiskSpaceInUse()) + "GB"); + diskUsageBar.setToolTipText("Total: " + NumberUtil.formatNumber((server.getTotalDiskSpace()/1024)) + + "GB, In Use: " + NumberUtil.formatNumber((server.getDiskSpaceInUse()/1024)) + "GB"); } toolkit.createLabel(section, "Status: ", SWT.NONE); 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 2d9b8700..060599e9 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 @@ -35,8 +35,10 @@ import org.eclipse.ui.part.ViewPart; import com.gluster.storage.management.client.GlusterDataModelManager; import com.gluster.storage.management.client.VolumesClient; import com.gluster.storage.management.core.model.Alert; +import com.gluster.storage.management.core.model.Brick; import com.gluster.storage.management.core.model.Cluster; import com.gluster.storage.management.core.model.DefaultClusterListener; +import com.gluster.storage.management.core.model.Disk; import com.gluster.storage.management.core.model.Event; import com.gluster.storage.management.core.model.Event.EVENT_TYPE; import com.gluster.storage.management.core.model.GlusterServer; @@ -225,7 +227,7 @@ public class VolumeSummaryView extends ViewPart { createStripeCountField(section); } - createNumOfDisksField(section); + createNumOfBricksField(section); createDiskSpaceField(section); // createTransportTypeField(section); createNASProtocolField(section); @@ -410,11 +412,30 @@ public class VolumeSummaryView extends ViewPart { } }); } + + private double getDiskSize(String serverName, String diskName) { + GlusterServer server = cluster.getServer(serverName); + for (Disk disk : server.getDisks() ) { + if (disk.getName().equals(diskName)) { + return disk.getSpace(); + } + } + return (Double) null; + } + + private double getTotalDiskSpace() { + double diskSize = 0; + for (Brick brick : volume.getBricks()) { + diskSize += getDiskSize(brick.getServerName(), brick.getDiskName()); + } + return diskSize; + + } private void createDiskSpaceField(Composite section) { Label diskSpaceLabel = toolkit.createLabel(section, "Total Disk Space (GB): ", SWT.NONE); diskSpaceLabel.setToolTipText("boldnormal"); - toolkit.createLabel(section, "" + NumberUtil.formatNumber(volume.getTotalDiskSpace()), SWT.NONE); + toolkit.createLabel(section, "" + NumberUtil.formatNumber((getTotalDiskSpace() / 1024) ), SWT.NONE); toolkit.createLabel(section, "", SWT.NONE); // dummy } @@ -440,9 +461,9 @@ public class VolumeSummaryView extends ViewPart { toolkit.createLabel(section, "", SWT.NONE); // dummy } - private void createNumOfDisksField(Composite section) { + private void createNumOfBricksField(Composite section) { toolkit.createLabel(section, "Number of Bricks: ", SWT.NONE); - toolkit.createLabel(section, "" + volume.getNumOfDisks(), SWT.NONE); + toolkit.createLabel(section, "" + volume.getNumOfBricks(), SWT.NONE); toolkit.createLabel(section, "", SWT.NONE); // dummy } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/GlusterServersPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/GlusterServersPage.java index efa2eaaa..87644622 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/GlusterServersPage.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/GlusterServersPage.java @@ -42,11 +42,11 @@ public class GlusterServersPage extends AbstractTableViewerPage { private List glusterServers; public enum GLUSTER_SERVER_TABLE_COLUMN_INDICES { - NAME, IP_ADDRESSES, NUM_OF_CPUS, TOTAL_MEMORY, TOTAL_DISK_SPACE, AVAILABLE_DISK_SPACE, STATUS // Removed PREFERRED_NETWORK + NAME, IP_ADDRESSES, NUM_OF_CPUS, TOTAL_MEMORY, TOTAL_FREE_SPACE, TOTAL_DISK_SPACE, STATUS // Removed PREFERRED_NETWORK }; private static final String[] GLUSTER_SERVER_TABLE_COLUMN_NAMES = new String[] { "Name", - "IP Address(es)", "Number\nof CPUs", "Total\nMemory (GB)", "Space (GB)", "Space\nAvailable (GB)", "Status" }; // Removed "Preferred\nNetwork", + "IP Address(es)", "Number\nof CPUs", "Total\nMemory (GB)", "Free Space (GB)", "Total \n Space (GB)", "Status" }; // Removed "Preferred\nNetwork", public GlusterServersPage(IWorkbenchSite site, final Composite parent, int style, final EntityGroup servers) { super(site, parent, style, servers); @@ -83,8 +83,8 @@ public class GlusterServersPage extends AbstractTableViewerPage { //setColumnProperties(table, SERVER_DISK_TABLE_COLUMN_INDICES.CPU_USAGE, SWT.CENTER, 90); setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.TOTAL_MEMORY, SWT.CENTER, 90); //setColumnProperties(table, SERVER_DISK_TABLE_COLUMN_INDICES.MEMORY_IN_USE, SWT.CENTER, 90); + setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.TOTAL_FREE_SPACE, SWT.CENTER, 90); setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.TOTAL_DISK_SPACE, SWT.CENTER, 90); - setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.AVAILABLE_DISK_SPACE, SWT.CENTER, 90); //setColumnProperties(table, SERVER_DISK_TABLE_COLUMN_INDICES.DISK_SPACE_IN_USE, SWT.CENTER, 90); } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java index d0824888..3a8891d4 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java @@ -41,7 +41,7 @@ public class VolumesPage extends AbstractTableViewerPage { private List volumes; public enum VOLUME_TABLE_COLUMN_INDICES { - NAME, VOLUME_TYPE, NUM_OF_DISKS, TRANSPORT_TYPE, VOLUME_STATUS + NAME, VOLUME_TYPE, NUM_OF_BRICKS, TRANSPORT_TYPE, VOLUME_STATUS }; private static final String[] VOLUME_TABLE_COLUMN_NAMES = new String[] { "Name", "Volume Type", @@ -59,7 +59,7 @@ public class VolumesPage extends AbstractTableViewerPage { @Override protected void setColumnProperties(Table table) { setColumnProperties(table, VOLUME_TABLE_COLUMN_INDICES.VOLUME_STATUS, SWT.CENTER, 50); - setColumnProperties(table, VOLUME_TABLE_COLUMN_INDICES.NUM_OF_DISKS, SWT.CENTER, 50); + setColumnProperties(table, VOLUME_TABLE_COLUMN_INDICES.NUM_OF_BRICKS, SWT.CENTER, 50); setColumnProperties(table, VOLUME_TABLE_COLUMN_INDICES.TRANSPORT_TYPE, SWT.CENTER, 70); } -- cgit