Removed Disk.py and cleanup in DiskUtils.py

Signed-off-by: Bala.FA <bala@gluster.com>

2 files changed, 4 insertions, 194 deletions

diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/Disk.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/Disk.py
deleted file mode 100755
index 3b44e3a8..00000000
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/Disk.py
+++ /dev/null
@@ -1,127 +0,0 @@
-#  Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of GlusterSP.
-#
-
-import os
-import dbus
-
-class Disk:
-    def __init__(self):
-        """init"""
-
-        self.volumes = []
-        self.disks = []
-        self.bus = dbus.SystemBus()
-        self.hal_obj = self.bus.get_object("org.freedesktop.Hal",
-                                      "/org/freedesktop/Hal/Manager")
-        self.hal = dbus.Interface(self.hal_obj, "org.freedesktop.Hal.Manager")
-        self.devices = []
-        self.devices = self.hal.FindDeviceByCapability("storage")
-
-        self.detect_disks()
-        self.detect_mountable_volumes()
-
-    def getDiskList(self):
-
-        return self.disks
-
-    def getMountableDiskList(self):
-
-        return self.volumes
-
-    def detect_disks(self):
-        for device in self.devices:
-            dev = self._get_device(device)
-            if dev.GetProperty("storage.drive_type") != "cdrom":
-                if not dev.GetProperty("block.is_volume"):
-                    self._add_disks(dev)
-                    continue
-
-    def _add_disks(self, dev):
-        disk = str(dev.GetProperty('block.device'))
-        disk_size = str(int(dev.GetProperty('storage.size')) / 1024**2)
-
-        try: 
-            if dev.GetProperty('storage.removable'):
-                disk_size = str(int(dev.GetProperty('storage.removable.media_size')) / 1024**2)
-        except:  # TODO: Add appropriated exception on property error.
-            return
-
-        self.disks.append({
-                'device': disk,
-                'description': str(dev.GetProperty('storage.model')) + " " + str(dev.GetProperty('storage.vendor')),
-                'interface': str(dev.GetProperty('storage.bus')),
-                'size': disk_size,
-                'drive_type': str(dev.GetProperty('storage.drive_type'))
-                })
-
-    def detect_mountable_volumes(self):
-        """ Detect all mountable volumes using HAL via D-Bus """
-        for device in self.devices:
-            dev = self._get_device(device)
-            if dev.GetProperty("storage.drive_type") != "cdrom":
-                if dev.GetProperty("block.is_volume"):
-                    self._add_volume(dev)
-                    continue
-                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"):
-                            self._add_volume(child, parent=dev)
-                            #break      # don't break, allow all partitions
-
-    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')),
-                'fstype'  : str(dev.GetProperty('volume.fstype')),
-                'fsversion': str(dev.GetProperty('volume.fsversion')),
-                'uuid'    : str(dev.GetProperty('volume.uuid')),
-                'interface': str(parent.GetProperty('storage.bus')),
-                'parent'  : str(parent.GetProperty('block.device')),
-                'description': str(parent.GetProperty('storage.model')) + " " + str(parent.GetProperty('storage.vendor')),
-                'size'    : str(int(dev.GetProperty('volume.size')) / 1024**2),
-                'totalsize'    : str(int(parent.GetProperty('storage.size')) / 1024**2),
-                '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 """
-        dev_obj = self.bus.get_object("org.freedesktop.Hal", udi)
-        return dbus.Interface(dev_obj, "org.freedesktop.Hal.Device")
-
-    def get_free_bytes(self, device=None):
-        """ Return the number of available bytes on our device """
-        import statvfs
-        stat = os.statvfs(device)
-        return stat[statvfs.F_BSIZE] * stat[statvfs.F_BAVAIL]
-
-    def get_used_bytes(self, device=None):
-        """ Return the number of used bytes on our device """
-        import statvfs
-        stat = os.statvfs(device)
-        return ((stat[statvfs.F_BSIZE] * stat[statvfs.F_BLOCKS]) - (stat[statvfs.F_BSIZE] * stat[statvfs.F_BAVAIL]))
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py
index 5d7b0b4a..bfa9c575 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py
@@ -17,7 +17,6 @@ import dbus
 import Globals
 import time
 import Utils
-import Disk
 import Protocol
 import FsTabUtils
 
@@ -109,60 +108,6 @@ def getRootPartition(fsTabFile=Globals.FSTAB_FILE):
             return getDeviceName(fsTabEntry["Device"])
     return None
 
-def getRaidDisk():
-    array = []
-    arrayList = []
-    mdFound = False
-    
-    try:
-        fp = open("/proc/mdstat")
-        for line in fp:
-            str = line.strip()
-            if str.startswith("md"):
-                array.append(str)
-                mdFound = True
-                continue
-            if mdFound:
-                if str:
-                    array.append(str)
-                else:
-                    arrayList.append(array)
-                    array = []
-                    mdFound = False
-        fp.close()
-    except IOError, e:
-        return None
-                
-    raidList = {}
-    for array in arrayList:
-        raid = {}
-        tokens = array[0].split()
-        raid['Interface'] = tokens[3]
-        device = getDevice(tokens[0])
-        raid['MountPoint'] = getDeviceMountPoint(device)
-        if raid['MountPoint']:
-            raid['Type'] = "DATA"
-            raid['SpaceInUse'] = getDeviceUsedSpace(device)
-        else:
-            raid['SpaceInUse'] = None
-        rv = Utils.runCommand("blkid -c /dev/null %s" % (device), output=True, root=True)
-        raid['Uuid'] = None
-        raid['FsType'] = None
-        raid['Status'] = "UNINITIALIZED"
-        if isDiskInFormatting(device):
-            raid['Status'] = "INITIALIZING"
-        if not rv["Stderr"]:
-            words = rv["Stdout"].strip().split()
-            if words:
-                raid['Status'] = "INITIALIZED"
-            if len(words) > 2:
-                raid['Uuid']  = words[1].split("UUID=")[-1].split('"')[1]
-                raid['FsType'] = words[2].split("TYPE=")[-1].split('"')[1]
-        raid['Disks'] = [x.split('[')[0] for x in tokens[4:]]
-        raid['Size'] = float(array[1].split()[0]) / 1024.0
-        raidList[tokens[0]] = raid
-    return raidList
-
 
 def getOsDisk():
     Utils.log("WARNING: getOsDisk() is deprecated by getRootPartition()")
@@ -342,24 +287,16 @@ def getDiskSizeInfo(partition):
 
 
 def isDataDiskPartitionFormatted(device):
-    #if getDiskPartitionLabel(device) != Globals.DATA_PARTITION_LABEL:
-    #    return False
-    device = getDeviceName(device)
-    diskObj = Disk.Disk()
-    for disk in  diskObj.getMountableDiskList():
-        if disk['device'].upper() == device.upper():
-            mountPoint = disk['mount_point']
-            if not mountPoint:
-                return False
-            if not os.path.exists(mountPoint):
-                return False
+    rv = Utils.runCommand("blkid -c /dev/null -o value %s" % device, output=True, root=True)
+    if rv["Status"] != 0:
+        return False
 
     uuid = getUuidByDiskPartition(device)
     if not uuid:
         return False
 
     for fsTabEntry in FsTabUtils.readFsTab():
-        if fsTabEntry["Device"] == ("UUID=%s" % uuid) and fsTabEntry["MountPoint"] == mountPoint:
+        if fsTabEntry["Device"] == ("UUID=%s" % uuid) or fsTabEntry["Device"] == device:
             return True
     return False