[Libguestfs] [v2v PATCH 2/3] tests: rename "luks" to "lvm-on-luks"

[Laszlo Ersek]

Clarify that our current usage of "luks" stands for "lvm-on-luks" (IOW,
that the decrypted LUKS devices are Physical Volumes for LVM).

(This is a port of libguestfs patch 'tests: rename "luks" to
"lvm-on-luks"' -- commit 39a5bb6fda4d. See also guestfs-tools commit
8f2bbc3d50d8 -- 'inspector: rename "luks" to "lvm-on-luks"', 2022-02-28.)

Signed-off-by: Laszlo Ersek <lersek at redhat.com>
---
 test-data/phony-guests/Makefile.am                                                      | 8 ++++----
 tests/Makefile.am                                                                       | 4 ++--
 .gitignore                                                                              | 2 +-
 test-data/phony-guests/guests.xml.in                                                    | 4 ++--
 test-data/phony-guests/make-fedora-img.pl                                               | 8 ++++----
 tests/{test-v2v-fedora-luks-conversion.sh => test-v2v-fedora-lvm-on-luks-conversion.sh} | 2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/test-data/phony-guests/Makefile.am b/test-data/phony-guests/Makefile.am
index c45ddc1123e0..6d7db3da8043 100644
--- a/test-data/phony-guests/Makefile.am
+++ b/test-data/phony-guests/Makefile.am
@@ -49,7 +49,7 @@ disk_images = \
 	fedora-md1.img \
 	fedora-md2.img \
 	fedora-btrfs.img \
-	fedora-luks.img \
+	fedora-lvm-on-luks.img \
 	ubuntu.img \
 	archlinux.img \
 	coreos.img \
@@ -99,12 +99,12 @@ fedora-btrfs.img: make-fedora-img.pl \
 		fedora-static-bin
 	SRCDIR=$(srcdir) LAYOUT=btrfs $(top_builddir)/run --test ./$<
 
-# Make a (dummy) Fedora image with LVM encrypted with LUKS.
-fedora-luks.img: make-fedora-img.pl \
+# Make a (dummy) Fedora image with LVM-on-LUKS.
+fedora-lvm-on-luks.img: make-fedora-img.pl \
 		fedora-journal.tar.xz \
 		fedora.db \
 		fedora-static-bin
-	SRCDIR=$(srcdir) LAYOUT=lvm-luks $(top_builddir)/run --test ./$<
+	SRCDIR=$(srcdir) LAYOUT=lvm-on-luks $(top_builddir)/run --test ./$<
 
 # Make a (dummy) Debian image.
 debian.img: make-debian-img.sh
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 63e654a3d148..75a05874094d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -98,7 +98,7 @@ TESTS = \
 	test-v2v-virtio-win-iso.sh \
 	test-v2v-fedora-conversion.sh \
 	test-v2v-fedora-btrfs-conversion.sh \
-	test-v2v-fedora-luks-conversion.sh \
+	test-v2v-fedora-lvm-on-luks-conversion.sh \
 	test-v2v-fedora-md-conversion.sh \
 	test-v2v-windows-conversion.sh \
 	rhbz1232192.sh \
@@ -177,7 +177,7 @@ EXTRA_DIST += \
 	test-v2v-cdrom.sh \
 	test-v2v-fedora-conversion.sh \
 	test-v2v-fedora-btrfs-conversion.sh \
-	test-v2v-fedora-luks-conversion.sh \
+	test-v2v-fedora-lvm-on-luks-conversion.sh \
 	test-v2v-fedora-md-conversion.sh \
 	test-v2v-floppy.expected \
 	test-v2v-floppy.sh \
diff --git a/.gitignore b/.gitignore
index 04ab847dcd7f..cf96c1af29be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,7 +114,7 @@ Makefile.in
 /test-data/phony-guests/debian.img
 /test-data/phony-guests/fedora.img
 /test-data/phony-guests/fedora-btrfs.img
-/test-data/phony-guests/fedora-luks.img
+/test-data/phony-guests/fedora-lvm-on-luks.img
 /test-data/phony-guests/fedora-md1.img
 /test-data/phony-guests/fedora-md2.img
 /test-data/phony-guests/fedora-static-bin
diff --git a/test-data/phony-guests/guests.xml.in b/test-data/phony-guests/guests.xml.in
index 9f64c35cd80f..339a6f7de839 100644
--- a/test-data/phony-guests/guests.xml.in
+++ b/test-data/phony-guests/guests.xml.in
@@ -185,7 +185,7 @@
 
   <!-- LUKS password is 'FEDORA' -->
   <domain type='test'>
-    <name>fedora-luks</name>
+    <name>fedora-lvm-on-luks</name>
     <memory>1048576</memory>
     <os>
       <type>hvm</type>
@@ -194,7 +194,7 @@
     <devices>
       <disk type='file' device='disk'>
         <driver name='qemu' type='raw'/>
-        <source file='@abs_builddir@/fedora-luks.img'/>
+        <source file='@abs_builddir@/fedora-lvm-on-luks.img'/>
         <target dev='vda' bus='virtio'/>
       </disk>
     </devices>
diff --git a/test-data/phony-guests/make-fedora-img.pl b/test-data/phony-guests/make-fedora-img.pl
index 488a7d89963c..0d886bdf1af6 100755
--- a/test-data/phony-guests/make-fedora-img.pl
+++ b/test-data/phony-guests/make-fedora-img.pl
@@ -171,8 +171,8 @@ EOF
     }
 }
 
-elsif ($ENV{LAYOUT} eq 'lvm-luks') {
-    push (@images, "fedora-luks.img-t");
+elsif ($ENV{LAYOUT} eq 'lvm-on-luks') {
+    push (@images, "fedora-lvm-on-luks.img-t");
 
     open (my $fstab, '>', "fedora.fstab") or die;
     print $fstab <<EOF;
@@ -183,9 +183,9 @@ EOF
 
     $bootdev = '/dev/sda1';
 
-    $g->disk_create ("fedora-luks.img-t", "raw", $IMAGE_SIZE);
+    $g->disk_create ("fedora-lvm-on-luks.img-t", "raw", $IMAGE_SIZE);
 
-    $g->add_drive ("fedora-luks.img-t", format => "raw");
+    $g->add_drive ("fedora-lvm-on-luks.img-t", format => "raw");
     $g->launch ();
 
     $g->part_init ('/dev/sda', 'mbr');
diff --git a/tests/test-v2v-fedora-luks-conversion.sh b/tests/test-v2v-fedora-lvm-on-luks-conversion.sh
similarity index 95%
rename from tests/test-v2v-fedora-luks-conversion.sh
rename to tests/test-v2v-fedora-lvm-on-luks-conversion.sh
index 2922c31da13c..e3e70e8c66e1 100755
--- a/tests/test-v2v-fedora-luks-conversion.sh
+++ b/tests/test-v2v-fedora-lvm-on-luks-conversion.sh
@@ -25,7 +25,7 @@ set -e
 set -x
 
 skip_if_skipped
-f=../test-data/phony-guests/fedora-luks.img
+f=../test-data/phony-guests/fedora-lvm-on-luks.img
 requires test -f $f
 
 # The disk is encrypted with password "FEDORA".
-- 
2.19.1.3.g30247aa5d201