diff options
author | John Ferlan <jferlan@redhat.com> | 2016-07-11 07:50:57 -0400 |
---|---|---|
committer | John Ferlan <jferlan@redhat.com> | 2016-07-14 13:01:58 -0400 |
commit | a8d0afc75a0a5c902f1e4188a616651a17a9d050 (patch) | |
tree | f3d6c8e6bd10e616e35a395f78d463b7793b7560 /tests/storagevolxml2xmlout | |
parent | 5bcbf724151e2c37208bad1e47a92d60784291b6 (diff) | |
download | libvirt-a8d0afc75a0a5c902f1e4188a616651a17a9d050.tar.gz |
tests: Adjust LUKS tests to use 'volume' secret type
Commit id's '9bbf0d7e6' and '2552fec24' added some XML parsing tests
for a LUKS volume to use a 'passphrase' secret format. After commit,
this was deemed to be incorrect, so covert the various tests to use
the volume usage format where the 'usage' is the path to the volume
rather than a user defined name string.
Also, removed the qemuxml2argv-luks-disk-cipher.xml since it was
just a duplicate of qemuxml2argv-luks-disks.xml.
Signed-off-by: John Ferlan <jferlan@redhat.com>
Diffstat (limited to 'tests/storagevolxml2xmlout')
-rw-r--r-- | tests/storagevolxml2xmlout/vol-luks-cipher.xml | 2 | ||||
-rw-r--r-- | tests/storagevolxml2xmlout/vol-luks.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/storagevolxml2xmlout/vol-luks-cipher.xml b/tests/storagevolxml2xmlout/vol-luks-cipher.xml index 901484920f..1ac7424376 100644 --- a/tests/storagevolxml2xmlout/vol-luks-cipher.xml +++ b/tests/storagevolxml2xmlout/vol-luks-cipher.xml @@ -15,7 +15,7 @@ <label>unconfined_u:object_r:virt_image_t:s0</label> </permissions> <encryption format='luks'> - <secret type='passphrase' usage='mumblyfratz'/> + <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/> <cipher name='serpent' size='256' mode='cbc' hash='sha256'/> <ivgen name='plain64' hash='sha256'/> </encryption> diff --git a/tests/storagevolxml2xmlout/vol-luks.xml b/tests/storagevolxml2xmlout/vol-luks.xml index 5b764b76a1..7b82866c6f 100644 --- a/tests/storagevolxml2xmlout/vol-luks.xml +++ b/tests/storagevolxml2xmlout/vol-luks.xml @@ -15,7 +15,7 @@ <label>unconfined_u:object_r:virt_image_t:s0</label> </permissions> <encryption format='luks'> - <secret type='passphrase' usage='mumblyfratz'/> + <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/> </encryption> </target> </volume> |