From 538703ba6f843f7e858bf4f10f62e187cd7ea821 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 22 May 2018 15:03:02 +0200
Subject: [PATCH] tests: qemublock: Switch to qcow2+luks in test files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../xml2json/file-qcow2-backing-chain-encryption.json           | 2 +-
 .../xml2json/file-qcow2-backing-chain-encryption.xml            | 2 +-
 .../xml2json/network-qcow2-backing-chain-encryption_auth.json   | 2 +-
 .../xml2json/network-qcow2-backing-chain-encryption_auth.xml    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.json
index 3469c06654..376fce9f9e 100644
--- 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 a1292284bf..75a3a8f029 100644
--- 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 6e5abbfbdd..fdb6f2ab1a 100644
--- 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 bc2925b4cf..a62c0321ec 100644
--- 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'>