From dff04e0af045f73ea6a2c89ae50239acfefdcb5d Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 4 Apr 2017 14:04:39 +0200
Subject: [PATCH] storage: gluster: Use volume name as "<name>" field in the
 XML

For native gluster pools the <dir> field denotes a directory inside the
pool. For the actual pool name the <name> field has to be used.
---
 src/storage/storage_util.c                       | 16 ++++++++++++++--
 .../gluster-parse-basic-native.xml               |  3 ++-
 .../gluster-parse-multivol-native.xml            |  9 ++++++---
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 1e44a2da44..7cc125a384 100644
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -2846,6 +2846,7 @@ virStorageUtilGlusterExtractPoolSources(const char *host,
     xmlXPathContextPtr ctxt = NULL;
     xmlNodePtr *nodes = NULL;
     virStoragePoolSource *src = NULL;
+    char *volname;
     size_t i;
     int nnodes;
     int ret = -1;
@@ -2862,14 +2863,25 @@ virStorageUtilGlusterExtractPoolSources(const char *host,
         if (!(src = virStoragePoolSourceListNewSource(list)))
             goto cleanup;
 
-        if (!(src->dir = virXPathString("string(./name)", ctxt))) {
+        if (!(volname = virXPathString("string(./name)", ctxt))) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("failed to extract gluster volume name"));
             goto cleanup;
         }
 
-        if (pooltype == VIR_STORAGE_POOL_NETFS)
+        if (pooltype == VIR_STORAGE_POOL_NETFS) {
             src->format = VIR_STORAGE_POOL_NETFS_GLUSTERFS;
+            src->dir = volname;
+        } else if (pooltype == VIR_STORAGE_POOL_GLUSTER) {
+            src->name = volname;
+
+            if (VIR_STRDUP(src->dir, "/") < 0)
+                goto cleanup;
+        } else {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("unsupported gluster lookup"));
+            goto cleanup;
+        }
 
         if (VIR_ALLOC_N(src->hosts, 1) < 0)
             goto cleanup;
diff --git a/tests/virstorageutildata/gluster-parse-basic-native.xml b/tests/virstorageutildata/gluster-parse-basic-native.xml
index fbde06f3b3..895d0f3fdb 100644
--- a/tests/virstorageutildata/gluster-parse-basic-native.xml
+++ b/tests/virstorageutildata/gluster-parse-basic-native.xml
@@ -1,6 +1,7 @@
 <sources>
   <source>
     <host name='testhost'/>
-    <dir path='vol0'/>
+    <dir path='/'/>
+    <name>vol0</name>
   </source>
 </sources>
diff --git a/tests/virstorageutildata/gluster-parse-multivol-native.xml b/tests/virstorageutildata/gluster-parse-multivol-native.xml
index d2d8fefc64..c758ac5aa7 100644
--- a/tests/virstorageutildata/gluster-parse-multivol-native.xml
+++ b/tests/virstorageutildata/gluster-parse-multivol-native.xml
@@ -1,14 +1,17 @@
 <sources>
   <source>
     <host name='testhost'/>
-    <dir path='aaa'/>
+    <dir path='/'/>
+    <name>aaa</name>
   </source>
   <source>
     <host name='testhost'/>
-    <dir path='test'/>
+    <dir path='/'/>
+    <name>test</name>
   </source>
   <source>
     <host name='testhost'/>
-    <dir path='test1'/>
+    <dir path='/'/>
+    <name>test1</name>
   </source>
 </sources>