diff options
author | Ján Tomko <jtomko@redhat.com> | 2013-07-22 15:44:06 +0200 |
---|---|---|
committer | Ján Tomko <jtomko@redhat.com> | 2013-07-25 13:26:41 +0200 |
commit | 3a75fca28964a320e5590ff2d14e36c5ea8bf7f5 (patch) | |
tree | 70fe128fa269e375ca00569bc9ba230e15ba9468 /tests/storagevolxml2xmlout | |
parent | 823778829e851495d20d6d68a8cedafc85ad7ef5 (diff) | |
download | libvirt-3a75fca28964a320e5590ff2d14e36c5ea8bf7f5.tar.gz |
Move volume XMLs out of storagevolxml2argvdata
Reuse the XML files in storagevolxml2xmlin.
(This requires changing a few backing files to /dev/null,
since virStorageBackendCreateQemuImgCmd checks for its
presence)
Diffstat (limited to 'tests/storagevolxml2xmlout')
-rw-r--r-- | tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml | 35 | ||||
-rw-r--r-- | tests/storagevolxml2xmlout/vol-qcow2-1.1.xml | 2 | ||||
-rw-r--r-- | tests/storagevolxml2xmlout/vol-qcow2-lazy.xml | 2 | ||||
-rw-r--r-- | tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml | 21 | ||||
-rw-r--r-- | tests/storagevolxml2xmlout/vol-qcow2.xml | 2 |
5 files changed, 59 insertions, 3 deletions
diff --git a/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml b/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml new file mode 100644 index 0000000000..a7b5fedfb8 --- /dev/null +++ b/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml @@ -0,0 +1,35 @@ +<volume> + <name>OtherDemo.img</name> + <key>(null)</key> + <source> + </source> + <capacity unit='bytes'>5368709120</capacity> + <allocation unit='bytes'>294912</allocation> + <target> + <path>/var/lib/libvirt/images/OtherDemo.img</path> + <format type='qcow2'/> + <permissions> + <mode>0644</mode> + <owner>0</owner> + <group>0</group> + <label>unconfined_u:object_r:virt_image_t:s0</label> + </permissions> + <encryption format='qcow'> + <secret type='passphrase' uuid='e78d4b51-a2af-485f-b0f5-afca709a80f4'/> + </encryption> + <compat>0.10</compat> + <features> + <lazy_refcounts/> + </features> + </target> + <backingStore> + <path>/dev/null</path> + <format type='raw'/> + <permissions> + <mode>0644</mode> + <owner>0</owner> + <group>0</group> + <label>unconfined_u:object_r:virt_image_t:s0</label> + </permissions> + </backingStore> +</volume> diff --git a/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml b/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml index 454ac11299..b7df8a6cae 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml @@ -21,7 +21,7 @@ <features/> </target> <backingStore> - <path>/var/lib/libvirt/images/BaseDemo.img</path> + <path>/dev/null</path> <format type='raw'/> <permissions> <mode>0644</mode> diff --git a/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml b/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml index 4e30edef98..92b7875668 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml @@ -23,7 +23,7 @@ </features> </target> <backingStore> - <path>/var/lib/libvirt/images/BaseDemo.img</path> + <path>/dev/null</path> <format type='raw'/> <permissions> <mode>0644</mode> diff --git a/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml b/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml new file mode 100644 index 0000000000..e2da702bcd --- /dev/null +++ b/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml @@ -0,0 +1,21 @@ +<volume> + <name>OtherDemo.img</name> + <key>(null)</key> + <source> + </source> + <capacity unit='bytes'>5368709120</capacity> + <allocation unit='bytes'>294912</allocation> + <target> + <path>/var/lib/libvirt/images/OtherDemo.img</path> + <format type='qcow2'/> + <permissions> + <mode>0644</mode> + <owner>0</owner> + <group>0</group> + <label>unconfined_u:object_r:virt_image_t:s0</label> + </permissions> + <encryption format='qcow'> + <secret type='passphrase' uuid='e78d4b51-a2af-485f-b0f5-afca709a80f4'/> + </encryption> + </target> +</volume> diff --git a/tests/storagevolxml2xmlout/vol-qcow2.xml b/tests/storagevolxml2xmlout/vol-qcow2.xml index 4490931f18..f931a629cd 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2.xml @@ -19,7 +19,7 @@ </encryption> </target> <backingStore> - <path>/var/lib/libvirt/images/BaseDemo.img</path> + <path>/dev/null</path> <format type='raw'/> <permissions> <mode>0644</mode> |