From 92e11c5b3357527411d8f1682a2297f868beb468 Mon Sep 17 00:00:00 2001
From: Sergei Shtepa <70029228+SergeiShtepa@users.noreply.github.com>
Date: Wed, 29 Nov 2023 17:02:11 +0100
Subject: [PATCH] Merge pull request #81 from hburaylee/VAL-6.1

fix snapshot block device path in tests
---
 tests/1000-simple.sh          | 6 +++---
 tests/2000-stretch.sh         | 2 +-
 tests/4000-diff_storage.sh    | 4 ++--
 tests/5000-pullout.sh         | 6 +++---
 tests/6000-snapimage_write.sh | 4 ++--
 tests/simpleTest.sh           | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/1000-simple.sh b/tests/1000-simple.sh
index bfcdea36..ddc404c3 100755
--- a/tests/1000-simple.sh
+++ b/tests/1000-simple.sh
@@ -83,15 +83,15 @@ check_files ${MOUNTPOINT_1}
 echo "Check snapshots"
 IMAGE_1=${TESTDIR}/image0
 mkdir -p ${IMAGE_1}
-mount /dev/veeamblksnap-image0 ${IMAGE_1}
+mount /dev/veeamblksnapimg0 ${IMAGE_1}
 check_files ${IMAGE_1}
 
 echo "Write to snapshot"
 generate_files ${IMAGE_1} "snapshot" 3
 
 drop_cache
-umount /dev/veeamblksnap-image0
-mount /dev/veeamblksnap-image0 ${IMAGE_1}
+umount /dev/veeamblksnapimg0
+mount /dev/veeamblksnapimg0 ${IMAGE_1}
 
 check_files ${IMAGE_1}
 
diff --git a/tests/2000-stretch.sh b/tests/2000-stretch.sh
index 3af5013a..99e654d1 100755
--- a/tests/2000-stretch.sh
+++ b/tests/2000-stretch.sh
@@ -63,7 +63,7 @@ echo "Check snapshot before overflow."
 
 IMAGE_1=${MPDIR}/image0
 mkdir -p ${IMAGE_1}
-mount /dev/veeamblksnap-image0 ${IMAGE_1}
+mount /dev/veeamblksnapimg0 ${IMAGE_1}
 check_files ${IMAGE_1}
 
 echo "Try to make snapshot overflow."
diff --git a/tests/4000-diff_storage.sh b/tests/4000-diff_storage.sh
index 8e11bb71..537ec0b7 100755
--- a/tests/4000-diff_storage.sh
+++ b/tests/4000-diff_storage.sh
@@ -53,9 +53,9 @@ IMAGE=${MP_DIR}/image0
 mkdir -p ${IMAGE}
 
 echo "Mount image"
-mount /dev/veeamblksnap-image0 ${IMAGE}
+mount /dev/veeamblksnapimg0 ${IMAGE}
 # for XFS filesystem nouuid option needed
-#mount -o nouuid /dev/veeamblksnap-image0 ${IMAGE}
+#mount -o nouuid /dev/veeamblksnapimg0 ${IMAGE}
 
 check_files ${IMAGE}/${RELATIVE_TEST_DIR}
 
diff --git a/tests/5000-pullout.sh b/tests/5000-pullout.sh
index dc638874..113b5f7f 100755
--- a/tests/5000-pullout.sh
+++ b/tests/5000-pullout.sh
@@ -75,15 +75,15 @@ check_files ${MOUNTPOINT_1}
 echo "Check snapshots"
 IMAGE_1=${TESTDIR}/image0
 mkdir -p ${IMAGE_1}
-mount /dev/veeamblksnap-image0 ${IMAGE_1}
+mount /dev/veeamblksnapimg0 ${IMAGE_1}
 check_files ${IMAGE_1}
 
 echo "Write to snapshot"
 generate_files ${IMAGE_1} "snapshot" 3
 
 drop_cache
-umount /dev/veeamblksnap-image0
-mount /dev/veeamblksnap-image0 ${IMAGE_1}
+umount /dev/veeamblksnapimg0
+mount /dev/veeamblksnapimg0 ${IMAGE_1}
 
 check_files ${IMAGE_1}
 
diff --git a/tests/6000-snapimage_write.sh b/tests/6000-snapimage_write.sh
index 4fa8b25a..a647fc67 100755
--- a/tests/6000-snapimage_write.sh
+++ b/tests/6000-snapimage_write.sh
@@ -57,8 +57,8 @@ else
 	END="$2"
 fi
 
-IMAGEDEVICE=/dev/veeamblksnap-image0
-IMAGEMOUNTPOINT=/mnt/veeamblksnap-image0
+IMAGEDEVICE=/dev/veeamblksnapimg0
+IMAGEMOUNTPOINT=/mnt/veeamblksnapimg0
 mkdir -p ${IMAGEMOUNTPOINT}
 
 DIFF_STORAGE="${MOUNTPOINT}/diff_storage/"
diff --git a/tests/simpleTest.sh b/tests/simpleTest.sh
index feaeb2e5..2a5e7e4d 100755
--- a/tests/simpleTest.sh
+++ b/tests/simpleTest.sh
@@ -25,7 +25,7 @@ echo "STORE_UUID: $STORE_UUID"
 SNAP_ID=$(./blksnap create-snapshot --device $SRC_DEVICE --store $STORE_UUID)
 echo "SNAP_ID: $SNAP_ID"
 
-mount "/dev/veeamblksnap-image0" $DST_MOUNT_DIR
+mount "/dev/veeamblksnapimg0" $DST_MOUNT_DIR
 SNAPSHOT_SHA=$(sha1sum "$DST_MOUNT_DIR/test_file")
 echo "ORIGINAL_SHA: $ORIGINAL_SHA"
 echo "SNAPSHOT_SHA: $SNAPSHOT_SHA"