diff options
| author | Shireesh Anjal <anjalshireesh@gmail.com> | 2011-07-08 02:05:25 -0700 |
|---|---|---|
| committer | Shireesh Anjal <anjalshireesh@gmail.com> | 2011-07-08 02:05:25 -0700 |
| commit | e77dfd47f68721591e10671688f596e42e6e08f0 (patch) | |
| tree | ba04b2f687769e3cda626c6dec52c9905057da24 | |
| parent | c4a9e5c5a2db7210b44124dd45f81654cf3714ba (diff) | |
| parent | 11c712dd3bf4af478f59b53976bc93ad1081e48b (diff) | |
Merge pull request #104 from Selvasundaram/master
Disk data model change bug fix
3 files changed, 3 insertions, 3 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 32341eca..f09f20ba 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 @@ -113,8 +113,7 @@ public class Disk extends Device { // } // } // } - - return false; + return true; } public void copyFrom(Disk newDisk) { 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 d6564610..fe0529e6 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 @@ -49,6 +49,7 @@ public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter { switch (status) { case INITIALIZED: + case READY: return guiHelper.getImage(IImageKeys.STATUS_ONLINE); case IO_ERROR: return guiHelper.getImage(IImageKeys.STATUS_OFFLINE); diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java index df1b72cc..449dd269 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java @@ -73,7 +73,7 @@ public class GlusterUtil { private static final GlusterCoreUtil glusterCoreUtil = new GlusterCoreUtil(); - private static final String INITIALIZE_DISK_STATUS_SCRIPT = "format_device_status.py"; + private static final String INITIALIZE_DISK_STATUS_SCRIPT = "get_format_device_status.py"; @Autowired private SshUtil sshUtil; |