summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.server.scripts
diff options
context:
space:
mode:
Diffstat (limited to 'src/com.gluster.storage.management.server.scripts')
-rw-r--r--src/com.gluster.storage.management.server.scripts/src/nodes/Disk.py3
-rwxr-xr-xsrc/com.gluster.storage.management.server.scripts/src/nodes/get_server_details.py (renamed from src/com.gluster.storage.management.server.scripts/src/nodes/GetServerDetails.py)10
2 files changed, 10 insertions, 3 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 d5d8de31..6a4c2998 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
@@ -99,7 +99,8 @@ class Disk:
'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'))
+ 'drive_type': str(parent.GetProperty('storage.drive_type')),
+ 'mount_point': str(dev.GetProperty('volume.mount_point'))
})
def _get_device(self, udi):
diff --git a/src/com.gluster.storage.management.server.scripts/src/nodes/GetServerDetails.py b/src/com.gluster.storage.management.server.scripts/src/nodes/get_server_details.py
index 440347a4..67148586 100755
--- a/src/com.gluster.storage.management.server.scripts/src/nodes/GetServerDetails.py
+++ b/src/com.gluster.storage.management.server.scripts/src/nodes/get_server_details.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
# Copyright (C) 2009 Gluster, Inc. <http://www.gluster.com>
# This file is part of Gluster Storage Platform.
#
@@ -188,6 +189,7 @@ def getServerDetails():
continue
partitionTag = responseDom.createTag("disk", None)
partitionTag.appendChild(responseDom.createTag("name", os.path.basename(disk['device'])))
+ 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'])
@@ -204,5 +206,9 @@ def getServerDetails():
serverTag.appendChild(responseDom.createTag("diskSpaceInUse", str(diskSpaceInUse)))
return serverTag
-def test():
- print getServerDetails().toxml()
+def main():
+ print getServerDetails().toprettyxml()
+ sys.exit(0)
+
+if __name__ == "__main__":
+ main()