tests: Adjust LUKS tests to use 'volume' secret type

Commit id's '9bbf0d7e' and '2552fec2' 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: NJohn Ferlan <jferlan@redhat.com>

tests/qemuxml2argvdata/qemuxml2argv-luks-disk-cipher.xml

-<domain type='qemu'>
-  <name>encryptdisk</name>
-  <uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>524288</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='luks'/>
-      <source file='/storage/guest_disks/encryptdisk'/>
-      <target dev='vda' bus='virtio'/>
-      <encryption format='luks'>
-        <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/>
-      </encryption>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-    </disk>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='luks'/>
-      <source file='/storage/guest_disks/encryptdisk2'/>
-      <target dev='vdb' bus='virtio'/>
-      <encryption format='luks'>
-        <secret type='passphrase' usage='mycluster_myname'/>
-      </encryption>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-    </memballoon>
-  </devices>
-</domain>

tests/qemuxml2argvdata/qemuxml2argv-luks-disks.xml

@@ -28,7 +28,7 @@
       <source file='/storage/guest_disks/encryptdisk2'/>
       <target dev='vdb' bus='virtio'/>
       <encryption format='luks'>
-        <secret type='passphrase' usage='mycluster_myname'/>
+        <secret type='passphrase' usage='/storage/guest_disks/encryptdisk2'/>
       </encryption>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </disk>

tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disk-cipher.xml

-../qemuxml2argvdata/qemuxml2argv-luks-disk-cipher.xml
\ No newline at end of file

tests/qemuxml2xmltest.c

@@ -557,7 +557,6 @@ mymain(void)
     DO_TEST("encrypted-disk");
     DO_TEST("encrypted-disk-usage");
     DO_TEST("luks-disks");
-    DO_TEST("luks-disk-cipher");
     DO_TEST("memtune");
     DO_TEST("memtune-unlimited");
     DO_TEST("blkiotune");

tests/storagevolxml2xmlin/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>

tests/storagevolxml2xmlin/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>

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>

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>