Follow-up to I7e4c5bc7df5d4ee2d489c3a0edc197fecc5782a2

create partition table and partition first
instead of creating a filesystem on a raw block device.
Apparently this has some impact when using ecrypted volumes.

Related-Issue: PRODX-37480
Change-Id: I072c22fa2f53fc69880412fbfda3149c4e6129c7
diff --git a/heat_tempest_plugin/tests/scenario/templates/test_volumes_create_from_backup.yaml b/heat_tempest_plugin/tests/scenario/templates/test_volumes_create_from_backup.yaml
index 37c4cb9..2c8600e 100644
--- a/heat_tempest_plugin/tests/scenario/templates/test_volumes_create_from_backup.yaml
+++ b/heat_tempest_plugin/tests/scenario/templates/test_volumes_create_from_backup.yaml
@@ -75,9 +75,9 @@
               sleep 1
             done
             dev_name=$(basename $(dirname $(find /sys -name 'serial' -exec grep -l $vol_id {} +)))
-            if grep -q $dev_name /proc/partitions
+            if grep -q ${dev_name}1 /proc/partitions
             then
-              mount /dev/$dev_name /mnt
+              mount /dev/${dev_name}1 /mnt
               TESTDATA=$(cat /mnt/testfile)
               curl wc_extra_args -X PUT -H 'Content-Type:' --data-binary '{"Status": "SUCCESS", "Reason": "Test Complete", "Data": "Volume Data:'$TESTDATA'", "UniqueId": "instance1"}' "wc_url"
             else
diff --git a/heat_tempest_plugin/tests/scenario/templates/test_volumes_delete_snapshot.yaml b/heat_tempest_plugin/tests/scenario/templates/test_volumes_delete_snapshot.yaml
index 1864ebd..3ce0f62 100644
--- a/heat_tempest_plugin/tests/scenario/templates/test_volumes_delete_snapshot.yaml
+++ b/heat_tempest_plugin/tests/scenario/templates/test_volumes_delete_snapshot.yaml
@@ -84,8 +84,9 @@
             dev_name=$(basename $(dirname $(find /sys -name 'serial' -exec grep -l $vol_id {} +)))
             if grep -q $dev_name /proc/partitions
             then
-              mkfs.ext4 /dev/$dev_name
-              mount /dev/$dev_name /mnt
+              echo 'type=83' | sfdisk /dev/$dev_name
+              mkfs.ext4 /dev/${dev_name}1
+              mount /dev/${dev_name}1 /mnt
               echo "test_string" > /mnt/testfile
               sync -f /mnt/testfile
               umount /mnt