Updated get server detail function to fetch uninitialized disk details.

2 files changed, 28 insertions, 1 deletions

diff --git a/src/com.gluster.storage.management.server.scripts/src/nodes/Disk.py b/src/com.gluster.storage.management.server.scripts/src/nodes/Disk.py
index 6a4c2998..a1ab9264 100644
--- a/src/com.gluster.storage.management.server.scripts/src/nodes/Disk.py
+++ b/src/com.gluster.storage.management.server.scripts/src/nodes/Disk.py
@@ -80,6 +80,8 @@ class Disk:
                 else: # iterate over children looking for a volume
                     children = self.hal.FindDeviceStringMatch("info.parent",
                                                          device)
+                    if not children and "disk" == dev.GetProperty("storage.drive_type"):
+                        self._add_volume(dev)
                     for child in children:
                         child = self._get_device(child)
                         if child.GetProperty("block.is_volume"):
@@ -88,6 +90,23 @@ class Disk:
 
     def _add_volume(self, dev, parent=None):
         volume = str(dev.GetProperty('block.device'))
+        if not parent:
+            self.volumes.append ({
+                'device'  : volume,
+                'label'   : str(dev.GetProperty('block.device')),
+                'fstype'  : None,
+                'fsversion': None,
+                'uuid'    : None,
+                'interface': str(dev.GetProperty('storage.bus')),
+                'parent'  : None,
+                'description': str(dev.GetProperty('storage.model')) + " " + str(dev.GetProperty('storage.vendor')),
+                'size'    : None,
+                'totalsize'    : str(int(dev.GetProperty('storage.size')) / 1024**2),
+                'drive_type': str(dev.GetProperty('storage.drive_type')),
+                'mount_point': "NA"
+                                })
+            return
+        
         self.volumes.append ({
                 'device'  : volume,
                 'label'   : str(dev.GetProperty('volume.label')),
@@ -102,6 +121,7 @@ class Disk:
                 'drive_type': str(parent.GetProperty('storage.drive_type')),
                 'mount_point': str(dev.GetProperty('volume.mount_point'))
                 })
+        return
 
     def _get_device(self, udi):
         """ Return a dbus Interface to a specific HAL device UDI """
diff --git a/src/com.gluster.storage.management.server.scripts/src/nodes/get_server_details.py b/src/com.gluster.storage.management.server.scripts/src/nodes/get_server_details.py
index 8737b69e..932be8d7 100755
--- a/src/com.gluster.storage.management.server.scripts/src/nodes/get_server_details.py
+++ b/src/com.gluster.storage.management.server.scripts/src/nodes/get_server_details.py
@@ -195,14 +195,21 @@ def getServerDetails():
         partitionTag.appendChild(responseDom.createTag("mountPoint", disk['mount_point']))
         partitionTag.appendChild(responseDom.createTag("serverName", serverName))
         partitionTag.appendChild(responseDom.createTag("description", disk['description']))
-        total, used, free = getDiskSizeInfo(disk['device'])
+        total, used, free = 0, 0, 0
+        if disk['size']:
+            total, used, free = getDiskSizeInfo(disk['device'])
         if total:
             partitionTag.appendChild(responseDom.createTag("space", str(total)))
             totalDiskSpace += total
+        else:
+            partitionTag.appendChild(responseDom.createTag("space", "NA"))
         if used:
             partitionTag.appendChild(responseDom.createTag("spaceInUse", str(used)))
             diskSpaceInUse += used
             partitionTag.appendChild(responseDom.createTag("status", "READY"))
+        else:
+            partitionTag.appendChild(responseDom.createTag("spaceInUse", "NA"))
+            partitionTag.appendChild(responseDom.createTag("status", "UNINITIALIZED"))
         diskTag.appendChild(partitionTag)
     serverTag.appendChild(diskTag)
     serverTag.appendChild(responseDom.createTag("totalDiskSpace", str(totalDiskSpace)))