Bug fixed: Initialized used variable before its used.

Merge branch 'master' of github.com:TimothyAsir/console

14 files changed, 101 insertions, 113 deletions

diff --git a/src/com.gluster.storage.management.server.scripts/src/Common.py b/src/com.gluster.storage.management.server.scripts/src/Common.py
index 99c2f440..c85e9a2b 100644
--- a/src/com.gluster.storage.management.server.scripts/src/Common.py
+++ b/src/com.gluster.storage.management.server.scripts/src/Common.py
@@ -18,26 +18,3 @@
 import sys

 import syslog

 

-def log(priority, message=None):

-    if type(priority) == type(""):

-        logPriority = syslog.LOG_INFO

-        logMessage = priority

-    else:

-        logPriority = priority

-        logMessage = message

-    if not logMessage:

-        return

-    #if Globals.DEBUG:

-    #    sys.stderr.write(logMessage)

-    else:

-        syslog.syslog(logPriority, logMessage)

-    return

-

-

-def stripEmptyLines(content):

-    ret = ""

-    for line in content.split("\n"):

-        if line.strip() != "":

-            ret += line

-    return ret

-

diff --git a/src/com.gluster.storage.management.server.scripts/src/Disk.py b/src/com.gluster.storage.management.server.scripts/src/Disk.py
index a1ab9264..2c47d396 100755
--- a/src/com.gluster.storage.management.server.scripts/src/Disk.py
+++ b/src/com.gluster.storage.management.server.scripts/src/Disk.py
@@ -17,7 +17,6 @@
 
 import os
 import dbus
-from Common import *
 
 class Disk:
     def __init__(self):
diff --git a/src/com.gluster.storage.management.server.scripts/src/DiskUtils.py b/src/com.gluster.storage.management.server.scripts/src/DiskUtils.py
index f548cb7f..4861f4c4 100644
--- a/src/com.gluster.storage.management.server.scripts/src/DiskUtils.py
+++ b/src/com.gluster.storage.management.server.scripts/src/DiskUtils.py
@@ -19,9 +19,7 @@ import os
 import glob
 from copy import deepcopy
 import dbus
-import syslog
 import Globals
-import Common
 import time
 import Utils
 import Disk
@@ -78,7 +76,7 @@ def getUuidByDiskPartition(device):
 
 
 def getDiskPartitionUuid(partition):
-    Common.log("WARNING: getDiskPartitionUuid() is deprecated by getUuidByDiskPartition()")
+    Utils.log("WARNING: getDiskPartitionUuid() is deprecated by getUuidByDiskPartition()")
     return getUuidByDiskPartition(partition)
 
 
@@ -92,7 +90,7 @@ def getDiskPartitionByLabel(label):
 
 
 def getDeviceByLabel(label):
-    Common.log("WARNING: getDeviceByLabel() is deprecated by getDiskPartitionByLabel()")
+    Utils.log("WARNING: getDeviceByLabel() is deprecated by getDiskPartitionByLabel()")
     return getDiskPartitionByLabel(label)
 
 
@@ -155,7 +153,7 @@ def getRaidDisk():
 
 
 def getOsDisk():
-    Common.log("WARNING: getOsDisk() is deprecated by getRootPartition()")
+    Utils.log("WARNING: getOsDisk() is deprecated by getRootPartition()")
     return getRootPartition()
 
 
@@ -206,6 +204,7 @@ def getDiskInfo(diskDeviceList=None):
         partitionUdiList = halManager.FindDeviceStringMatch("info.parent", udi)
         diskSpaceInUse = 0
         for partitionUdi in partitionUdiList:
+            used = 0
             partitionHalDeviceObj = dbusSystemBus.get_object("org.freedesktop.Hal",
                                                              partitionUdi)
             partitionHalDevice = dbus.Interface(partitionHalDeviceObj,
@@ -279,7 +278,7 @@ def readFsTab(fsTabFile=Globals.FSTAB_FILE):
     try:
         fsTabfp = open(fsTabFile)
     except IOError, e:
-        Common.log("readFsTab(): " + str(e))
+        Utils.log("readFsTab(): " + str(e))
         return None
     
     fsTabEntryList = []
@@ -348,9 +347,9 @@ def getDiskSizeInfo(partition):
     free = None
     command = "df -kl -t ext3 -t ext4 -t xfs"
     rv = Utils.runCommandFG(command, stdout=True, root=True)
-    message = Common.stripEmptyLines(rv["Stdout"])
+    message = Utils.stripEmptyLines(rv["Stdout"])
     if rv["Stderr"]:
-        Common.log(syslog.LOG_ERR, "failed to get disk details. %s" % Common.stripEmptyLines(rv["Stdout"]))
+        Utils.log("failed to get disk details. %s" % Utils.stripEmptyLines(rv["Stdout"]))
         return None, None, None
     for line in rv["Stdout"].split("\n"):
         tokens = line.split()
@@ -378,9 +377,9 @@ def getDiskSizeInfo(partition):
     number = int(partitionNumber)
     command = "parted -ms %s unit kb print" % disk
     rv = Utils.runCommandFG(command, stdout=True, root=True)
-    message = Common.stripEmptyLines(rv["Stdout"])
+    message = Utils.stripEmptyLines(rv["Stdout"])
     if rv["Stderr"]:
-        Common.log(syslog.LOG_ERR, "failed to get disk details. %s" % Common.stripEmptyLines(rv["Stdout"]))
+        Utils.log("failed to get disk details. %s" % Utils.stripEmptyLines(rv["Stdout"]))
         return None, None, None
     
     lines = rv["Stdout"].split(";\n")
@@ -401,7 +400,7 @@ def isDataDiskPartitionFormatted(device):
     #Todo: Proper label needs to be added for data partition
     #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():
@@ -527,9 +526,9 @@ def initializeDisk(disk, boot=False, startSize=0, sudo=False):
         command = "dd if=/dev/zero of=%s bs=1024K count=1" % diskObj["Device"]
         if runCommandFG(command, root=sudo) != 0:
             if boot:
-                Common.log("failed to clear boot sector of disk %s" % diskObj["Device"])
+                Utils.log("failed to clear boot sector of disk %s" % diskObj["Device"])
                 return False
-            Common.log("failed to clear boot sector of disk %s.  ignoring" % diskObj["Device"])
+            Utils.log("failed to clear boot sector of disk %s.  ignoring" % diskObj["Device"])
 
         command = "parted -s %s mklabel gpt" % diskObj["Device"]
         if runCommandFG(command, root=sudo) != 0:
@@ -560,15 +559,15 @@ def initializeDisk(disk, boot=False, startSize=0, sudo=False):
 
     if runCommandFG("udevadm settle", root=sudo) != 0:
         if runCommandFG("udevadm settle", root=sudo) != 0:
-            Common.log("udevadm settle for disk %s failed.  ignoring" % diskObj["Device"])
+            Utils.log("udevadm settle for disk %s failed.  ignoring" % diskObj["Device"])
     time.sleep(1)
 
     if runCommandFG("partprobe %s" % diskObj["Device"], root=sudo) != 0:
-        Common.log("partprobe %s failed" % diskObj["Device"])
+        Utils.log("partprobe %s failed" % diskObj["Device"])
         return False
 
     if runCommandFG("gptsync %s" % diskObj["Device"], root=sudo) != 0:
-        Common.log("gptsync %s failed.  ignoring" % diskObj["Device"])
+        Utils.log("gptsync %s failed.  ignoring" % diskObj["Device"])
 
     # wait forcefully to appear devices in /dev
     time.sleep(2)
@@ -576,12 +575,12 @@ def initializeDisk(disk, boot=False, startSize=0, sudo=False):
 
 
 def initializeOsDisk(diskObj):
-    Common.log("WARNING: initializeOsDisk() is deprecated by initializeDisk(boot=True)")
+    Utils.log("WARNING: initializeOsDisk() is deprecated by initializeDisk(boot=True)")
     return initializeDisk(diskObj, boot=True)
 
 
 def initializeDataDisk(diskObj):
-    Common.log("WARNING: initializeDataDisk() is deprecated by initializeDisk()")
+    Utils.log("WARNING: initializeDataDisk() is deprecated by initializeDisk()")
     return initializeDisk(diskObj)
 
 def getBootPartition(serverName):
@@ -638,7 +637,7 @@ def isDiskInFormatting(device):
 
 
 def isDiskInFormat(device):
-    Common.log("WARNING: isDiskInFormat() is deprecated by isDataDiskPartitionFormatted()")
+    Utils.log("WARNING: isDiskInFormat() is deprecated by isDataDiskPartitionFormatted()")
     return isDataDiskPartitionFormatted(device)
 
 
@@ -772,11 +771,11 @@ def compareDiskDom(diskDomA, diskDomB, requestFlag=True):
 def getServerConfigDiskDom(serverName, diskName=None):
     diskConfigDom = XDOM()
     if not diskConfigDom.parseFile("%s/%s/disk.xml" % (Globals.SERVER_VOLUME_CONF_DIR, serverName)):
-        Common.log("Unable to parse %s/%s/disk.xml" % (Globals.SERVER_VOLUME_CONF_DIR, serverName))
+        Utils.log("Unable to parse %s/%s/disk.xml" % (Globals.SERVER_VOLUME_CONF_DIR, serverName))
         return None
     diskTag = diskConfigDom.getElementsByTagRoute("disks.disk")
     if not diskTag:
-        Common.log("Unable to reterive disk information %s/%s/disk.xml" % (Globals.SERVER_VOLUME_CONF_DIR, serverName))
+        Utils.log("Unable to reterive disk information %s/%s/disk.xml" % (Globals.SERVER_VOLUME_CONF_DIR, serverName))
         return None
     if diskName:
         for tagE in diskTag:
diff --git a/src/com.gluster.storage.management.server.scripts/src/Utils.py b/src/com.gluster.storage.management.server.scripts/src/Utils.py
index 38d009f6..fe2816d0 100644
--- a/src/com.gluster.storage.management.server.scripts/src/Utils.py
+++ b/src/com.gluster.storage.management.server.scripts/src/Utils.py
@@ -34,7 +34,6 @@ import urllib
 
 import Globals
 import Protocol
-from Common import *
 
 RUN_COMMAND_ERROR = -1024
 LOG_SYSLOG = 1
@@ -703,7 +702,7 @@ def removeFile(fileName, root=False):
         os.remove(fileName)
         return True
     except OSError, e:
-        Utils.log("Failed to remove file %s: %s" % (fileName, e))
+        log("Failed to remove file %s: %s" % (fileName, e))
     return False
 
 
@@ -1030,3 +1029,36 @@ def configureDnsmasq(serverIpAddress, dhcpIpAddress):
 
 def configureDhcpServer(serverIpAddress, dhcpIpAddress):
     return configureDnsmasq(serverIpAddress, dhcpIpAddress)
+
+def log(priority, message=None):
+    if type(priority) == type(""):
+        logPriority = syslog.LOG_INFO
+        logMessage = priority
+    else:
+        logPriority = priority
+        logMessage = message
+    if not logMessage:
+        return
+    #if Globals.DEBUG:
+    #    sys.stderr.write(logMessage)
+    else:
+        syslog.syslog(logPriority, logMessage)
+    return
+
+
+def stripEmptyLines(content):
+    ret = ""
+    for line in content.split("\n"):
+        if line.strip() != "":
+            ret += line
+    return ret
+
+
+def getDeviceFormatStatusFile(device):
+    return "/var/tmp/format_%s.status" % device.replace('/', '_')
+
+def getDeviceFormatLockFile(device):
+    return "/var/lock/format_%s.lock" % device.replace('/', '_')
+
+def getDeviceFormatOutputFile(device):
+    return "/var/tmp/format_%s.out" % device.replace('/', '_')
diff --git a/src/com.gluster.storage.management.server.scripts/src/clear_volume_directory.py b/src/com.gluster.storage.management.server.scripts/src/clear_volume_directory.py
index 6cf2ef38..96677f56 100755
--- a/src/com.gluster.storage.management.server.scripts/src/clear_volume_directory.py
+++ b/src/com.gluster.storage.management.server.scripts/src/clear_volume_directory.py
@@ -22,13 +22,12 @@ import time
 from XmlHandler import ResponseXml
 import DiskUtils
 import Utils
-import Common
 from optparse import OptionParser
 
 def clearVolumeDirectory(diskMountPoint, volumeName, todelete):
     rs = ResponseXml()
     if not DiskUtils.checkDiskMountPoint(diskMountPoint):
-        Common.log(syslog.LOG_ERR, "failed to find disk mount point %s" % diskMountPoint) 
+        Utils.log("failed to find disk mount point %s" % diskMountPoint) 
         rs.appendTagRoute("status.code", "-1")
         rs.appendTagRoute("status.message", "Error: Mount point does not exists")
         return rs.toprettyxml()
@@ -48,11 +47,11 @@ def clearVolumeDirectory(diskMountPoint, volumeName, todelete):
     newVolumeDirectoryName = "%s_%s" % (volumeDirectory, time.time())
     command = ["sudo", "mv", "-f", volumeDirectory, newVolumeDirectoryName]
     rv = Utils.runCommandFG(command, stdout=True, root=True)
-    message = Common.stripEmptyLines(rv["Stdout"])
+    message = Utils.stripEmptyLines(rv["Stdout"])
     if rv["Stderr"]:
-        error = Common.stripEmptyLines(rv["Stderr"])
+        error = Utils.stripEmptyLines(rv["Stderr"])
         message += "Error: [%s]" % (error)
-        Common.log(syslog.LOG_ERR, "failed to rename volume directory %s, %s" % (volumeDirectory, error))
+        Utils.log("failed to rename volume directory %s, %s" % (volumeDirectory, error))
         rs.appendTagRoute("status.code", rv["Status"])
         rs.appendTagRoute("status.message", message)
         return rs.toprettyxml()
@@ -65,11 +64,11 @@ def clearVolumeDirectory(diskMountPoint, volumeName, todelete):
 
     command = ["sudo", "rm", "-fr", newVolumeDirectoryName]
     rv = Utils.runCommandFG(command, stdout=True, root=True)
-    message = Common.stripEmptyLines(rv["Stdout"])
+    message = Utils.stripEmptyLines(rv["Stdout"])
     if rv["Stderr"]:
-        error = Common.stripEmptyLines(rv["Stderr"])
+        error = Utils.stripEmptyLines(rv["Stderr"])
         message += "Error: [%s]" % (error)
-        Common.log(syslog.LOG_ERR, "failed to clear volume directory %s, %s" % (newVolumeDirectoryName, error))
+        Utils.log("failed to clear volume directory %s, %s" % (newVolumeDirectoryName, error))
         rs.appendTagRoute("status.code", rv["Status"])
         rs.appendTagRoute("status.message", message)
         return rs.toprettyxml()
@@ -86,7 +85,7 @@ def main():
     (options, args) = parser.parse_args()
 
     if len(args) != 2:
-        print >> sys.stderr, "usage: %s <disk mount point> <volume name> [-d/--delete]" % sys.argv[0]
+        sys.stderr.write("usage: %s <disk mount point> <volume name> [-d/--delete]\n" % os.path.basename(sys.argv[0]))
         sys.exit(-1)
 
     diskMountPoint = args[0]
diff --git a/src/com.gluster.storage.management.server.scripts/src/create_volume_directory.py b/src/com.gluster.storage.management.server.scripts/src/create_volume_directory.py
index b8fb2166..3e633697 100755
--- a/src/com.gluster.storage.management.server.scripts/src/create_volume_directory.py
+++ b/src/com.gluster.storage.management.server.scripts/src/create_volume_directory.py
@@ -17,20 +17,17 @@
 #  <http://www.gnu.org/licenses/>.
 import os
 import sys
-import syslog
 from XmlHandler import ResponseXml
 import DiskUtils
 import Utils
-import Common
 
 def createDirectory(disk, volumeName):
-
     # Retrieving disk uuid
     diskUuid = DiskUtils.getUuidByDiskPartition(DiskUtils.getDevice(disk))
 
     rs = ResponseXml()
     if not diskUuid:
-        Common.log(syslog.LOG_ERR, "failed to find disk:%s uuid" % disk)
+        Utils.log("failed to find disk:%s uuid" % disk)
         rs.appendTagRoute("status.code", "-1")
         rs.appendTagRoute("status.message", "Error: Unable to find disk uuid")
         return rs.toprettyxml()
@@ -38,7 +35,7 @@ def createDirectory(disk, volumeName):
     # Retrieving disk mount point using disk uuid
     diskMountPoint = DiskUtils.getMountPointByUuid(diskUuid)
     if not os.path.exists(diskMountPoint):
-        Common.log(syslog.LOG_ERR, "failed to retrieve disk:%s mount point" % disk) 
+        Utils.log("failed to retrieve disk:%s mount point" % disk) 
         rs.appendTagRoute("status.code", "-1")
         rs.appendTagRoute("status.message", "Error: Failed to retrieve disk details")
         return rs.toprettyxml()
@@ -46,7 +43,7 @@ def createDirectory(disk, volumeName):
     # creating volume directory under disk mount point
     volumeDirectory = "%s/%s" % (diskMountPoint, volumeName)
     if os.path.exists(volumeDirectory):
-        Common.log(syslog.LOG_ERR, "Volume directory:%s already exists" % (volumeDirectory))
+        Utils.log("Volume directory:%s already exists" % (volumeDirectory))
         rs.appendTagRoute("status.code", "-2")
         rs.appendTagRoute("status.message", "Volume directory already exists!")
         return rs.toprettyxml()
@@ -54,11 +51,11 @@ def createDirectory(disk, volumeName):
     if not os.path.exists(volumeDirectory):
         command = ["sudo", "mkdir", volumeDirectory]
         rv = Utils.runCommandFG(command, stdout=True, root=True)
-        message = Common.stripEmptyLines(rv["Stdout"])
+        message = Utils.stripEmptyLines(rv["Stdout"])
         if rv["Stderr"]:
-            error = Common.stripEmptyLines(rv["Stderr"])
+            error = Utils.stripEmptyLines(rv["Stderr"])
             message += "Error: [%s]" % (error)
-            Common.log(syslog.LOG_ERR, "failed to create volume directory %s, %s" % (volumeDirectory, error))
+            Utils.log("failed to create volume directory %s, %s" % (volumeDirectory, error))
             rs.appendTagRoute("status.code", rv["Status"])
             rs.appendTagRoute("status.message", message)
             return rs.toprettyxml()
@@ -73,7 +70,7 @@ def createDirectory(disk, volumeName):
 
 def main():
     if len(sys.argv) != 3:
-        print >> sys.stderr, "usage: %s <disk name> <volume name>" % sys.argv[0]
+        sys.stderr.write("usage: %s <disk name> <volume name>\n" % os.path.basename(sys.argv[0]))
         sys.exit(-1)
 
     disk = sys.argv[1]
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_disk_mount_point.py b/src/com.gluster.storage.management.server.scripts/src/get_disk_mount_point.py
index b2274b4d..2f4a39c3 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_disk_mount_point.py
+++ b/src/com.gluster.storage.management.server.scripts/src/get_disk_mount_point.py
@@ -17,15 +17,14 @@
 #  <http://www.gnu.org/licenses/>.
 
 import os
-import syslog
-import Common
+import Utils
 from DiskUtils import *
 from XmlHandler import ResponseXml
 
 
 def getmountpoint(path):
     if not path:
-        Common.log(syslog.LOG_ERR, "Not a valid path:%s" % path)
+        Utils.log("Not a valid path:%s" % path)
         rs.appendTagRoute("status.code", "-1")
         rs.appendTagRoute("status.message", "Error: given path name is empty")
         return rs.toprettyxml()
@@ -41,7 +40,7 @@ def getmountpoint(path):
                 mountPoint = line['MountPoint']
 
     if "/" == mountPoint or not mountPoint:
-        Common.log(syslog.LOG_ERR, "failed to find mount point of the given path:%s" % path)
+        Utils.log("failed to find mount point of the given path:%s" % path)
         rs.appendTagRoute("status.code", "-1")
         rs.appendTagRoute("status.message", "Error: Unable to find disk mount point")
         return rs.toprettyxml()
@@ -52,7 +51,7 @@ def getmountpoint(path):
 
 def main():
     if len(sys.argv) != 2:
-        print >> sys.stderr, "usage: %s <path>" % sys.argv[0]
+        sys.stderr.write("usage: %s <path>\n" % os.path.basename(sys.argv[0]))
         sys.exit(-1)
 
     path = sys.argv[1]
@@ -61,4 +60,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_disk_name_by_path.py b/src/com.gluster.storage.management.server.scripts/src/get_disk_name_by_path.py
index 72eb80dd..08e80b7e 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_disk_name_by_path.py
+++ b/src/com.gluster.storage.management.server.scripts/src/get_disk_name_by_path.py
@@ -17,15 +17,14 @@
 #  <http://www.gnu.org/licenses/>.
 
 import os
-import syslog
-import Common
+import Utils
 from DiskUtils import *
 from XmlHandler import ResponseXml
 
 
 def getmountpoint(path):
     if not path:
-        Common.log(syslog.LOG_ERR, "Not a valid path:%s" % path)
+        Utils.log("Not a valid path:%s" % path)
         rs.appendTagRoute("status.code", "-1")
         rs.appendTagRoute("status.message", "Error: given path name is empty")
         return rs.toprettyxml()
@@ -43,7 +42,7 @@ def getmountpoint(path):
                 fsTabEntry = line
 
     if "/" == mountPoint or not mountPoint:
-        Common.log(syslog.LOG_ERR, "failed to find mount point of the given path:%s" % path)
+        Utils.log("failed to find mount point of the given path:%s" % path)
         rs.appendTagRoute("status.code", "-1")
         rs.appendTagRoute("status.message", "Error: Unable to find disk mount point")
         return rs.toprettyxml()
@@ -57,7 +56,7 @@ def getmountpoint(path):
 
 def main():
     if len(sys.argv) != 2:
-        print >> sys.stderr, "usage: %s <path>" % sys.argv[0]
+        sys.stderr.write("usage: %s <path>\n" % os.path.basename(sys.argv[0]))
         sys.exit(-1)
 
     path = sys.argv[1]
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_file.py b/src/com.gluster.storage.management.server.scripts/src/get_file.py
index 826ade6e..61c33eba 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_file.py
+++ b/src/com.gluster.storage.management.server.scripts/src/get_file.py
@@ -16,8 +16,6 @@
 #  <http://www.gnu.org/licenses/>.
 
 import Globals
-import syslog
-import Commands
 import Utils
 from VolumeUtils import *
 from XmlHandler import ResponseXml
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_rrd_cpu_details.py b/src/com.gluster.storage.management.server.scripts/src/get_rrd_cpu_details.py
index a525d531..16670576 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_rrd_cpu_details.py
+++ b/src/com.gluster.storage.management.server.scripts/src/get_rrd_cpu_details.py
@@ -17,10 +17,8 @@
 #  <http://www.gnu.org/licenses/>.
 import os
 import sys
-import syslog
 from XmlHandler import ResponseXml
 import Utils
-import Common
 
 def getCpuData(period):
     cpuRrdFile = "/var/lib/rrd/cpu.rrd"
@@ -33,12 +31,12 @@ def getCpuData(period):
                "XPORT:cpusystem:'system'",
                "XPORT:cpuidle:'idle'"]
 
-    rv = Utils.runCommandFG(command, stdout=True, root=True)
-    message = Common.stripEmptyLines(rv["Stdout"])
+    rv = Utils.runCommand(command, output=True, root=True)
+    message = Utils.stripEmptyLines(rv["Stdout"])
     if rv["Stderr"]:
-        error = Common.stripEmptyLines(rv["Stderr"])
+        error = Utils.stripEmptyLines(rv["Stderr"])
         message += "Error: [%s]" % (error)
-        Common.log(syslog.LOG_ERR, "failed to create RRD file for cpu usages %s" % file)
+        Utils.log("failed to create RRD file for cpu usages %s" % file)
         rs.appendTagRoute("status.code", rv["Status"])
         rs.appendTagRoute("status.message", message)
         return rs.toxml()
@@ -46,7 +44,7 @@ def getCpuData(period):
 
 def main():
     if len(sys.argv) != 2:
-        print >> sys.stderr, "usage: %s <period>" % sys.argv[0]
+        sys.stderr.write("usage: %s <period>\n" % os.path.basename(sys.argv[0]))
         sys.exit(-1)
 
     period = sys.argv[1]
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_server_details.py b/src/com.gluster.storage.management.server.scripts/src/get_server_details.py
index a478afba..6eb75ca5 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_server_details.py
+++ b/src/com.gluster.storage.management.server.scripts/src/get_server_details.py
@@ -17,10 +17,8 @@
 #  <http://www.gnu.org/licenses/>.
 
 import sys
-import syslog
 import socket
 import re
-import Common
 import DiskUtils
 from NetworkUtils import *
 from Disk import *
@@ -88,7 +86,7 @@ def getServerDetails(listall):
     diskDom = DiskUtils.getDiskDom()
     if not diskDom:
         sys.stderr.write("No disk found!")
-        Common.log("Failed to get disk details")
+        Utils.log("Failed to get disk details")
         sys.exit(1)
 
     serverTag.appendChild(responseDom.createTag("cpuUsage", str(cpu)))
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_volume_log.py b/src/com.gluster.storage.management.server.scripts/src/get_volume_log.py
index 826ade6e..b906c002 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_volume_log.py
+++ b/src/com.gluster.storage.management.server.scripts/src/get_volume_log.py
@@ -17,7 +17,6 @@
 
 import Globals
 import syslog
-import Commands
 import Utils
 from VolumeUtils import *
 from XmlHandler import ResponseXml
diff --git a/src/com.gluster.storage.management.server.scripts/src/rrd_update_cpu_details.py b/src/com.gluster.storage.management.server.scripts/src/rrd_update_cpu_details.py
index 81ca6add..73982971 100755
--- a/src/com.gluster.storage.management.server.scripts/src/rrd_update_cpu_details.py
+++ b/src/com.gluster.storage.management.server.scripts/src/rrd_update_cpu_details.py
@@ -17,10 +17,8 @@
 #  <http://www.gnu.org/licenses/>.
 import os
 import sys
-import syslog
 from XmlHandler import ResponseXml
 import Utils
-import Common
 
 def createMemData(file, step):
     rs = ResponseXml()
@@ -33,12 +31,12 @@ def createMemData(file, step):
                "RRA:AVERAGE:0.5:24:732",
                "RRA:AVERAGE:0.5:144:1460"]
 
-    rv = Utils.runCommandFG(command, stdout=True, root=True)
-    message = Common.stripEmptyLines(rv["Stdout"])
+    rv = Utils.runCommand(command, output=True, root=True)
+    message = Utils.stripEmptyLines(rv["Stdout"])
     if rv["Stderr"]:
-        error = Common.stripEmptyLines(rv["Stderr"])
+        error = Utils.stripEmptyLines(rv["Stderr"])
         message += "Error: [%s]" % (error)
-        Common.log(syslog.LOG_ERR, "failed to create RRD file for cpu usages %s" % file)
+        Utils.log("failed to create RRD file for cpu usages %s" % file)
         rs.appendTagRoute("status.code", rv["Status"])
         rs.appendTagRoute("status.message", message)
         return rs.toxml()
@@ -59,18 +57,18 @@ def updateMemData(file):
                break
     
     if None == user:
-        Common.log(syslog.LOG_ERR, "failed to fetch cpu details from /proc/stat")
+        Utils.log("failed to fetch cpu details from /proc/stat")
         rs.appendTagRoute("status.code", "-1")
         rs.appendTagRoute("status.message", "failed to fetch cpu details")
         return rs.toxml()
 
     command = ["rrdtool", "update", file, "-t", "user:system:idle",
                "N:%s:%s:%s" % (user, system, idle)]
-    rv = Utils.runCommandFG(command, stdout=True, root=True)
+    rv = Utils.runCommand(command, output=True, root=True)
     if rv["Stderr"]:
-        error = Common.stripEmptyLines(rv["Stderr"])
+        error = Utils.stripEmptyLines(rv["Stderr"])
         message = "Error: [%s]" % (error)
-        Common.log(syslog.LOG_ERR, "failed to update cpu usage into rrd file %s" % file)
+        Utils.log("failed to update cpu usage into rrd file %s" % file)
         rs.appendTagRoute("status.code", rv["Status"])
         rs.appendTagRoute("status.message", message)
         return rs.toxml()
diff --git a/src/com.gluster.storage.management.server.scripts/src/rrd_update_memory_details.py b/src/com.gluster.storage.management.server.scripts/src/rrd_update_memory_details.py
index 23054769..fe4fcce6 100755
--- a/src/com.gluster.storage.management.server.scripts/src/rrd_update_memory_details.py
+++ b/src/com.gluster.storage.management.server.scripts/src/rrd_update_memory_details.py
@@ -17,10 +17,8 @@
 #  <http://www.gnu.org/licenses/>.
 import os
 import sys
-import syslog
 from XmlHandler import ResponseXml
 import Utils
-import Common
 
 def createMemData(file, step):
     rs = ResponseXml()
@@ -35,12 +33,12 @@ def createMemData(file, step):
                "RRA:AVERAGE:0.5:24:732",
                "RRA:AVERAGE:0.5:144:1460"]
 
-    rv = Utils.runCommandFG(command, stdout=True, root=True)
-    message = Common.stripEmptyLines(rv["Stdout"])
+    rv = Utils.runCommand(command, output=True, root=True)
+    message = Utils.stripEmptyLines(rv["Stdout"])
     if rv["Stderr"]:
-        error = Common.stripEmptyLines(rv["Stderr"])
+        error = Utils.stripEmptyLines(rv["Stderr"])
         message += "Error: [%s]" % (error)
-        Common.log(syslog.LOG_ERR, "failed to create RRD file for memory usages %s" % file)
+        Utils.log("failed to create RRD file for memory usages %s" % file)
         rs.appendTagRoute("status.code", rv["Status"])
         rs.appendTagRoute("status.message", message)
         return rs.toxml()
@@ -49,11 +47,11 @@ def createMemData(file, step):
 def updateMemData(file):
     rs = ResponseXml()
     command = ["free", "-b", "-o"]
-    rv = Utils.runCommandFG(command, stdout=True, root=True)
+    rv = Utils.runCommand(command, output=True, root=True)
     if rv["Stderr"]:
-        error = Common.stripEmptyLines(rv["Stderr"])
+        error = Utils.stripEmptyLines(rv["Stderr"])
         message += "Error: [%s]" % (error)
-        Common.log(syslog.LOG_ERR, "failed to retrieve memory details")
+        Utils.log("failed to retrieve memory details")
         rs.appendTagRoute("status.code", rv["Status"])
         rs.appendTagRoute("status.message", message)
         return rs.toxml()
@@ -61,12 +59,11 @@ def updateMemData(file):
     message = rv["Stdout"].split()
     command = ["rrdtool", "update", file, "-t", "memused:memfree:memcache:swapused:swapfree",
                "N:%s:%s:%s:%s:%s" % (message[8], message[9], message[12], message[14], message[15])]
-    rv = Utils.runCommandFG(command, stdout=True, root=True)
+    rv = Utils.runCommand(command, output=True, root=True)
     if rv["Stderr"]:
-        error = Common.stripEmptyLines(rv["Stderr"])
-        print error, command
+        error = Utils.stripEmptyLines(rv["Stderr"])
         message += "Error: [%s]" % (error)
-        Common.log(syslog.LOG_ERR, "failed to update memory usage into rrd file %s" % file)
+        Utils.log(syslog.LOG_ERR, "failed to update memory usage into rrd file %s" % file)
         rs.appendTagRoute("status.code", rv["Status"])
         rs.appendTagRoute("status.message", message)
         return rs.toxml()