Updated code to only print the error message in case of failure and exit with a non-zero status code

Updated in clear_volume_directory.py, create_volume_directory.py, get_rrd_cpu_details.py, get_rrd_memory_details.py, get_rrd_net_details.py

5 files changed, 29 insertions, 48 deletions

diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py
index 0f8248d8..a9da783b 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py
@@ -43,8 +43,7 @@ def main():
     if not options.todelete:
         sys.exit(0)
 
-    rv = Utils.runCommand("rm -fr %s" % newVolumeDirectoryName, root=True) != 0
-    sys.exit(rv)
+    sys.exit(Utils.runCommand("rm -fr %s" % newVolumeDirectoryName, root=True))
 
 if __name__ == "__main__":
     main()
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/create_volume_directory.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/create_volume_directory.py
index 66354412..a4eb2627 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/create_volume_directory.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/create_volume_directory.py
@@ -11,56 +11,44 @@ if not p1 in sys.path:
     sys.path.append(p1)
 if not p2 in sys.path:
     sys.path.append(p2)
-from XmlHandler import ResponseXml
 import DiskUtils
 import Utils
 
-def createDirectory(disk, volumeName):
+
+def main():
+    if len(sys.argv) != 3:
+        sys.stderr.write("usage: %s <disk name> <volume name>\n" % os.path.basename(sys.argv[0]))
+        sys.exit(-1)
+
+    disk = sys.argv[1]
+    volumeName = sys.argv[2]
+
     # Retrieving disk uuid
     diskUuid = DiskUtils.getUuidByDiskPartition(DiskUtils.getDevice(disk))
 
-    rs = ResponseXml()
     if not diskUuid:
         Utils.log("failed to find disk:%s uuid" % disk)
-        rs.appendTagRoute("status.code", "-1")
-        rs.appendTagRoute("status.message", "Error: Failed to find disk uuid")
-        return rs.toprettyxml()
+        sys.stderr.write("failed to find disk:%s uuid\n" % disk)
+        sys.exit(1)
 
     # Retrieving disk mount point using disk uuid
     diskMountPoint = DiskUtils.getMountPointByUuid(diskUuid)
     if not os.path.exists(diskMountPoint):
         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()
+        sys.stderr.write("failed to retrieve disk:%s mount point\n" % disk)
+        sys.exit(2)
 
     # creating volume directory under disk mount point
     volumeDirectory = "%s/%s" % (diskMountPoint, volumeName)
     if os.path.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()
+        sys.stderr.write("Volume directory:%s already exists\n" % (volumeDirectory))
+        sys.exit(3)
 
-    rv = Utils.runCommand("mkdir %s" % volumeDirectory, output=True, root=True)
-    if rv["Status"] != 0:
-        rs.appendTagRoute("status.code", rv["Status"])
-        rs.appendTagRoute("status.message", "Failed to create volume directory")
-        return rs.toprettyxml()
-
-    rs.appendTagRoute("status.code", rv["Status"])
-    rs.appendTagRoute("status.message", volumeDirectory)
-    return rs.toprettyxml()
-
-def main():
-    if len(sys.argv) != 3:
-        sys.stderr.write("usage: %s <disk name> <volume name>\n" % os.path.basename(sys.argv[0]))
-        sys.exit(-1)
-
-    disk = sys.argv[1]
-    volumeName = sys.argv[2]
-    print createDirectory(disk, volumeName)
-    sys.exit(0)
+    rv = Utils.runCommand("mkdir %s" % volumeDirectory, root=True)
+    if rv != 0:
+        sys.stderr.write("Failed to create volume directory\n")
+    sys.exit(rv)
 
 if __name__ == "__main__":
     main()
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_cpu_details.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_cpu_details.py
index 774f8e4e..0a05a4d3 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_cpu_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_cpu_details.py
@@ -11,7 +11,6 @@ if not p1 in sys.path:
     sys.path.append(p1)
 if not p2 in sys.path:
     sys.path.append(p2)
-from XmlHandler import ResponseXml
 import Utils
 
 CPU_RRD_FILE = "/var/lib/rrd/cpu.rrd"
@@ -23,7 +22,6 @@ def main():
 
     period = sys.argv[1]
 
-    rs = ResponseXml()
     command = "rrdtool xport --start -%s \
                DEF:cpuuser=%s:user:AVERAGE \
                DEF:cpusystem=%s:system:AVERAGE \
@@ -39,9 +37,9 @@ def main():
 
     rv = Utils.runCommand(command, output=True, root=True)
     if rv["Status"] != 0:
-        rs.appendTagRoute("status.code", rv["Status"])
-        rs.appendTagRoute("status.message", "Failed to get RRD data of CPU")
-        print rs.toxml()
+        sys.stderr.write("Failed to get RRD data of CPU\n")
+        sys.exit(rv["Status"])
+
     print rv["Stdout"]
     sys.exit(0)
 
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_memory_details.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_memory_details.py
index a9272b1f..1e3c24f6 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_memory_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_memory_details.py
@@ -38,7 +38,6 @@ if not p1 in sys.path:
 if not p2 in sys.path:
     sys.path.append(p2)
 import syslog
-from XmlHandler import ResponseXml
 import Utils
 
 MEMORY_RRD_FILE = "/var/lib/rrd/mem.rrd"
@@ -50,7 +49,6 @@ def main():
 
     period = sys.argv[1]
 
-    rs = ResponseXml()
     command = "rrdtool xport --start -%s \
                  DEF:free=%s:memfree:AVERAGE \
                  DEF:used=%s:memused:AVERAGE \
@@ -67,9 +65,9 @@ def main():
 
     rv = Utils.runCommand(command, output=True, root=True)
     if rv["Status"] != 0:
-        rs.appendTagRoute("status.code", rv["Status"])
-        rs.appendTagRoute("status.message", "Failed to get RRD data of memory usage")
-        print rs.toxml()
+        sys.stderr.write("Failed to get RRD data of memory usage\n")
+        sys.exit(rv["Status"])
+
     print rv["Stdout"]
     sys.exit(0)
 
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_net_details.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_net_details.py
index f4a7a465..41674ef9 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_net_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_net_details.py
@@ -11,7 +11,6 @@ if not p1 in sys.path:
     sys.path.append(p1)
 if not p2 in sys.path:
     sys.path.append(p2)
-from XmlHandler import ResponseXml
 import Utils
 
 def main():
@@ -22,7 +21,6 @@ def main():
     device = sys.argv[1]
     period = sys.argv[2]
 
-    rs = ResponseXml()
     command = "rrdtool xport --start -%s \
                DEF:received=/var/lib/rrd/network-%s.rrd:received:AVERAGE \
                DEF:transmitted=/var/lib/rrd/network-%s.rrd:transmitted:AVERAGE \
@@ -33,9 +31,9 @@ def main():
 
     rv = Utils.runCommand(command, output=True, root=True)
     if rv["Status"] != 0:
-        rs.appendTagRoute("status.code", rv["Status"])
-        rs.appendTagRoute("status.message", "Failed to get RRD information of device %s" % device)
-        print rs.toxml()
+        sys.stderr.write("Failed to get RRD information of device %s\n" % device)
+        sys.exit(rv["Status"])
+
     print rv["Stdout"]
     sys.exit(0)