tests: qemublock: Switch to qcow2+luks in test files

The next patch will forbid the old qcow2 encryption completely. Remove
it from the tests.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.json
index 3469c0665455ecaa9b5cb1f23deedc3e9b8bc36b..376fce9f9ee57022b1961b14dbc373428743fa79 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.json
+++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.json
@@ -21,7 +21,7 @@
   "read-only": true,
   "driver": "qcow2",
   "encrypt": {
-    "format": "aes",
+    "format": "luks",
     "key-secret": "node-b-f-encalias"
   },
   "file": "node-b-s",

diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.xml b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.xml
index a1292284bffbbfe63d627862b0552ea7a24dee8a..75a3a8f029cdcf420c7d26b3473d3f9f5019e4d4 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.xml
+++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.xml
@@ -20,7 +20,7 @@
           <nodename type='format' name='node-b-f'/>
         </nodenames>
       </privateData>
-      <encryption format='qcow'>
+      <encryption format='luks'>
         <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/>
       </encryption>
     </source>

diff --git a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.json b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.json
index 6e5abbfbdd6f31b313d58288b11e1ec4ab9daad1..fdb6f2ab1af6c68ef9aae673b3e9b9703ca86a6b 100644 (file)
--- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.json
+++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.json
@@ -33,7 +33,7 @@
   "read-only": true,
   "driver": "qcow2",
   "encrypt": {
-    "format": "aes",
+    "format": "luks",
     "key-secret": "node-b-f-encalias"
   },
   "file": "node-b-s",

diff --git a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.xml b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.xml
index bc2925b4cf9a95fd86668805bc4685884dca2b37..a62c0321ec706e4b38a67c9d1b79dc6cf1ec6141 100644 (file)
--- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.xml
+++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.xml
@@ -26,7 +26,7 @@
           <nodename type='format' name='node-b-f'/>
         </nodenames>
       </privateData>
-      <encryption format='qcow'>
+      <encryption format='luks'>
         <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/>
       </encryption>
       <auth username='testuser-iscsi'>