From 11c712dd3bf4af478f59b53976bc93ad1081e48b Mon Sep 17 00:00:00 2001
From: Selvasundaram <selvam@gluster.com>
Date: Fri, 8 Jul 2011 14:11:55 +0530
Subject: Disk data model change bug fix

---
 .../src/com/gluster/storage/management/core/model/Disk.java            | 3 +--
 .../gluster/storage/management/gui/ServerDiskTableLabelProvider.java   | 1 +
 .../src/com/gluster/storage/management/server/utils/GlusterUtil.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

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;
-- 
cgit