[libvirt] [PATCHv4 5/8] storage: improve directory support in gluster pool

[Eric Blake]

On 11/25/2013 08:56 AM, Daniel P. Berrange wrote:
> On Fri, Nov 22, 2013 at 08:20:27PM -0700, Eric Blake wrote:
> 
>> diff --git a/tests/storagevolxml2xmlin/vol-gluster-dir.xml b/tests/storagevolxml2xmlin/vol-gluster-dir.xml
>> new file mode 100644
>> index 0000000..bd20a6a
>> --- /dev/null
>> +++ b/tests/storagevolxml2xmlin/vol-gluster-dir.xml
>> @@ -0,0 +1,13 @@
>> +<volume>
>> +  <name>dir</name>
>> +  <key>/vol/dir</key>
>> +  <source>
>> +  </source>
>> +  <type>network-dir</type>
> 
> Per my other reply I think that 'type' would be better as an attribute
> on the top level <volume> element.

Indeed, 'make check' fails after my tweaks earlier in the series unless
I squash in this (now pushed):

diff --git i/src/storage/storage_backend_gluster.c
w/src/storage/storage_backend_gluster.c
index 51dc742..3f4e9f7 100644
--- i/src/storage/storage_backend_gluster.c
+++ w/src/storage/storage_backend_gluster.c
@@ -183,7 +183,7 @@
virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state,
     state->uri->path = tmp;

     if (S_ISDIR(st->st_mode)) {
-        vol->type = VIR_STORAGE_VOL_NETWORK_DIR;
+        vol->type = VIR_STORAGE_VOL_NETDIR;
         vol->target.format = VIR_STORAGE_FILE_DIR;
         *volptr = vol;
         vol = NULL;
diff --git i/tests/storagevolxml2xmlin/vol-gluster-dir.xml
w/tests/storagevolxml2xmlin/vol-gluster-dir.xml
index bd20a6a..208c2c2 100644
--- i/tests/storagevolxml2xmlin/vol-gluster-dir.xml
+++ w/tests/storagevolxml2xmlin/vol-gluster-dir.xml
@@ -1,9 +1,8 @@
-<volume>
+<volume type='netdir'>
   <name>dir</name>
-  <key>/vol/dir</key>
+  <key>vol/dir</key>
   <source>
   </source>
-  <type>network-dir</type>
   <capacity unit='bytes'>0</capacity>
   <allocation unit='bytes'>0</allocation>
   <target>
diff --git i/tests/storagevolxml2xmlout/vol-gluster-dir.xml
w/tests/storagevolxml2xmlout/vol-gluster-dir.xml
index 29e6d1a..f188ceb 100644
--- i/tests/storagevolxml2xmlout/vol-gluster-dir.xml
+++ w/tests/storagevolxml2xmlout/vol-gluster-dir.xml
@@ -1,9 +1,8 @@
-<volume>
+<volume type='netdir'>
   <name>dir</name>
-  <key>/vol/dir</key>
+  <key>vol/dir</key>
   <source>
   </source>
-  <type>network-dir</type>
   <capacity unit='bytes'>0</capacity>
   <allocation unit='bytes'>0</allocation>
   <target>


-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 621 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20131125/9b83c3ef/attachment-0001.sig>