Tweak Blivet LVM device type needles

There's some cheating/sloppiness going on here, with the same tag
and sometimes same needle being used to match "LVM2 Volume Group"
and "LVM2 Logical Volume". Today this caused us to pick the thin
pool entry instead in a test, so let's just clean this up and do
it right, with separate needles for matching each thing.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

check-needles.py

@@ -88,7 +88,7 @@ for num in range(1, 10):
 for scheme in ("standard", "lvmthin", "btrfs", "lvm"):
     testliterals.append(f"anaconda_part_scheme_{scheme}")
 # custom_blivet_add_partition
-for dtype in ("lvm", "lvmthin", "raid"):
+for dtype in ("lvmvg", "lvmlv", "lvmthin", "raid"):
     testliterals.append(f"anaconda_blivet_part_devicetype_{dtype}")
 for fsys in ("ext3", "ext4", "xfs", "btrfs", "ppc_prep_boot", "swap", "efi_filesystem"):
     testliterals.append(f"anaconda_blivet_part_fs_{fsys}")

needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm-20200116.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 205,
-      "width": 42,
-      "type": "match",
-      "height": 26,
-      "xpos": 409
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_blivet_part_devicetype_lvm"
-  ]
-}

needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm-20210208.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 26,
-      "ypos": 145,
-      "xpos": 397,
-      "width": 64,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_blivet_part_devicetype_lvm"
-  ]
-}

needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm.json

@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "anaconda_blivet_part_devicetype_lvm"
-  ],
-  "area": [
-    {
-      "xpos": 415,
-      "ypos": 149,
-      "width": 84,
-      "height": 18,
-      "type": "match"
-    }
-  ]
-}

needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv-20210608.json

@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 17,
+            "type": "match",
+            "width": 96,
+            "xpos": 434,
+            "ypos": 148
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "anaconda_blivet_part_devicetype_lvmlv"
+    ]
+}

needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv-blue-20210208.json

@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 18,
+            "type": "match",
+            "width": 96,
+            "xpos": 434,
+            "ypos": 147
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "anaconda_blivet_part_devicetype_lvmlv"
+    ]
+}

needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv.json

@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 16,
+            "type": "match",
+            "width": 95,
+            "xpos": 452,
+            "ypos": 149
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "anaconda_blivet_part_devicetype_lvmlv"
+    ]
+}

needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmvg-20200116.json

@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 17,
+            "type": "match",
+            "width": 87,
+            "xpos": 449,
+            "ypos": 211
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "anaconda_blivet_part_devicetype_lvmvg"
+    ]
+}

tests/disk_custom_blivet_lvm_ext4.pm

@@ -19,12 +19,12 @@ sub run {
     }
 
     custom_blivet_add_partition(size => 512, mountpoint => '/boot', filesystem => 'ext4');
-    # add new LVM device
+    # add new LVM VG
-    custom_blivet_add_partition(devicetype => 'lvm');
+    custom_blivet_add_partition(devicetype => 'lvmvg');
-    # select newly created LVM device for adding new partition
+    # select newly created LVM device for adding new LV
     assert_and_click "anaconda_blivet_volumes_icon";
-    # add lvm partition with ext4 and mount is as /
+    # add lvm LV with ext4 and mount it as /
-    custom_blivet_add_partition(devicetype => 'lvm', filesystem => 'ext4', mountpoint => '/');
+    custom_blivet_add_partition(devicetype => 'lvmlv', filesystem => 'ext4', mountpoint => '/');
 
     assert_and_click "anaconda_spoke_done";
     assert_and_click "anaconda_part_accept_changes";

tests/disk_custom_blivet_lvmthin.pm

@@ -19,9 +19,9 @@ sub run {
     }
 
     custom_blivet_add_partition(size => 512, mountpoint => '/boot');
-    # add new LVM device
+    # add new LVM VG
-    custom_blivet_add_partition(devicetype => 'lvm');
+    custom_blivet_add_partition(devicetype => 'lvmvg');
-    # select newly created LVM device for adding new partition
+    # select newly created LVM device for adding new pool
     assert_and_click "anaconda_blivet_volumes_icon";
     # add lvmthinpool
     custom_blivet_add_partition(devicetype => 'lvmthin');