diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-06-14 19:15:42 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-06-14 19:15:42 +0530 |
| commit | d57bce588e95c8f0bd90ba6e0069635e494bda88 (patch) | |
| tree | cb9c88255c451b05f1e0e9dafe3cb71fe2526895 /src/com.gluster.storage.management.core | |
| parent | b046462e6a888f744d16a3cfe73477faefee5c3b (diff) | |
| parent | c69d803bacdc198c0a7e4beba8c549c73ec41e02 (diff) | |
Merge branch 'new-icon'
Conflicts:
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java
Diffstat (limited to 'src/com.gluster.storage.management.core')
2 files changed, 12 insertions, 12 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java index 5b5422da..a399a03a 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java @@ -27,10 +27,10 @@ import com.gluster.storage.management.core.utils.StringUtil; @XmlRootElement(name="Disk") public class Disk extends Entity { public enum DISK_STATUS { - READY, UNINITIALIZED, INITIALIZING, IO_ERROR + AVAILABLE, UNINITIALIZED, INITIALIZING, IO_ERROR }; - private String[] DISK_STATUS_STR = { "Ready", "Uninitialized", "Initializing", "I/O Error" }; + private String[] DISK_STATUS_STR = { "Available", "Uninitialized", "Initializing", "I/O Error" }; private String serverName; private String mountPoint; @@ -64,7 +64,7 @@ public class Disk extends Entity { } public boolean isReady() { - return getStatus() == DISK_STATUS.READY; + return getStatus() == DISK_STATUS.AVAILABLE; } public DISK_STATUS getStatus() { diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java index 8921287a..8324b22d 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java @@ -72,7 +72,7 @@ public class GlusterDummyModel { private void addDiscoveredServer(List<Server> servers, Entity parent, String name, int numOfCPUs, double cpuUsage, double totalMemory, double memoryInUse, double totalDiskSpace, double diskSpaceInUse) { Server server = new Server(name, parent, numOfCPUs, cpuUsage, totalMemory, memoryInUse); - server.addDisk(new Disk(server, "sda", "/export/md0", totalDiskSpace, diskSpaceInUse, DISK_STATUS.READY)); + server.addDisk(new Disk(server, "sda", "/export/md0", totalDiskSpace, diskSpaceInUse, DISK_STATUS.AVAILABLE)); addNetworkInterface(server, "eth0"); servers.add(server); @@ -139,18 +139,18 @@ public class GlusterDummyModel { } private void initializeDisks() { - s1da = new Disk(server1, "sda", "/export/md0", 100d, 80d, DISK_STATUS.READY); - s1db = new Disk(server1, "sdb", "/export/md1", 100d, 67.83, DISK_STATUS.READY); + s1da = new Disk(server1, "sda", "/export/md0", 100d, 80d, DISK_STATUS.AVAILABLE); + s1db = new Disk(server1, "sdb", "/export/md1", 100d, 67.83, DISK_STATUS.AVAILABLE); - s2da = new Disk(server2, "sda", "/export/md0", 200d, 157.12, DISK_STATUS.READY); - s2db = new Disk(server2, "sdb", "/export/md1", 200d, 182.27, DISK_STATUS.READY); + s2da = new Disk(server2, "sda", "/export/md0", 200d, 157.12, DISK_STATUS.AVAILABLE); + s2db = new Disk(server2, "sdb", "/export/md1", 200d, 182.27, DISK_STATUS.AVAILABLE); s2dc = new Disk(server2, "sdc", "/export/md0", 200d, -1d, DISK_STATUS.UNINITIALIZED); - s2dd = new Disk(server2, "sdd", "/export/md1", 200d, 124.89, DISK_STATUS.READY); + s2dd = new Disk(server2, "sdd", "/export/md1", 200d, 124.89, DISK_STATUS.AVAILABLE); - s4da = new Disk(server4, "sda", "/export/md0", 100d, 85.39, DISK_STATUS.READY); + s4da = new Disk(server4, "sda", "/export/md0", 100d, 85.39, DISK_STATUS.AVAILABLE); - s5da = new Disk(server5, "sda", "/export/md1", 100d, 92.83, DISK_STATUS.READY); - s5db = new Disk(server5, "sdb", "/export/md1", 200d, 185.69, DISK_STATUS.READY); + s5da = new Disk(server5, "sda", "/export/md1", 100d, 92.83, DISK_STATUS.AVAILABLE); + s5db = new Disk(server5, "sdb", "/export/md1", 200d, 185.69, DISK_STATUS.AVAILABLE); } private void addDisksToServers() { |