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

3 files changed, 71 insertions, 2 deletions

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
index 0ec19d5b..134323b3 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
@@ -58,9 +58,9 @@ public class SelectDisksDialog extends Dialog {
 	private List<Disk> getSelectedDisks(List<Disk> allDisks, List<String> selectedDisks) {
 		List<Disk> disks = new ArrayList<Disk>();
 		for (String selectedDisk : selectedDisks) {
-			for (Disk disk : disks) {
+			for (Disk disk : allDisks) {
 				String brick[] = selectedDisk.split(":");
-				if (disk.getServerName() == brick[0] && disk.getName() == brick[1]) {
+				if (disk.getServerName().equals(brick[0]) && disk.getName().equals(brick[1])) {
 					disks.add(disk);
 				}
 			}
diff --git a/src/com.gluster.storage.management.server.scripts/src/nodes/get-disk-mount-point.py b/src/com.gluster.storage.management.server.scripts/src/nodes/get_disk_mount_point.py
index b2274b4d..b2274b4d 100755
--- a/src/com.gluster.storage.management.server.scripts/src/nodes/get-disk-mount-point.py
+++ b/src/com.gluster.storage.management.server.scripts/src/nodes/get_disk_mount_point.py
diff --git a/src/com.gluster.storage.management.server.scripts/src/nodes/get_disk_name_by_path.py b/src/com.gluster.storage.management.server.scripts/src/nodes/get_disk_name_by_path.py
new file mode 100755
index 00000000..72eb80dd
--- /dev/null
+++ b/src/com.gluster.storage.management.server.scripts/src/nodes/get_disk_name_by_path.py
@@ -0,0 +1,69 @@
+#!/usr/bin/python
+#  Copyright (C) 2010 Gluster, Inc. <http://www.gluster.com>
+#  This file is part of Gluster Storage Platform.
+#
+#  Gluster Storage Platform is free software; you can redistribute it
+#  and/or modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 3 of
+#  the License, or (at your option) any later version.
+#
+#  Gluster Storage Platform is distributed in the hope that it will be
+#  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+#  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see
+#  <http://www.gnu.org/licenses/>.
+
+import os
+import syslog
+import Common
+from DiskUtils import *
+from XmlHandler import ResponseXml
+
+
+def getmountpoint(path):
+    if not path:
+        Common.log(syslog.LOG_ERR, "Not a valid path:%s" % path)
+        rs.appendTagRoute("status.code", "-1")
+        rs.appendTagRoute("status.message", "Error: given path name is empty")
+        return rs.toprettyxml()
+
+    rs = ResponseXml()
+    mountPoint = None
+    fsTabEntry = None
+    for line in readFsTab():
+        if path.startswith(line['MountPoint']):
+            if not mountPoint:
+                mountPoint = line['MountPoint']
+                fsTabEntry = line
+            if len(line['MountPoint']) > len(mountPoint):
+                mountPoint = line['MountPoint']
+                fsTabEntry = line
+
+    if "/" == mountPoint or not mountPoint:
+        Common.log(syslog.LOG_ERR, "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()
+
+    rs.appendTagRoute("status.code", "0")
+    if fsTabEntry["Device"].startswith("UUID="):
+        rs.appendTagRoute("status.message", getDiskPartitionByUuid(fsTabEntry["Device"].split("UUID=")[-1]))
+    else:
+        rs.appendTagRoute("status.message", "Unable to find disk name")
+    return rs.toprettyxml()
+
+def main():
+    if len(sys.argv) != 2:
+        print >> sys.stderr, "usage: %s <path>" % sys.argv[0]
+        sys.exit(-1)
+
+    path = sys.argv[1]
+    print getmountpoint(path)
+    sys.exit(0)
+
+if __name__ == "__main__":
+    main()
+