diff --git a/test/ocf/common.sh b/test/ocf/common.sh new file mode 100644 index 000000000..7bc8bcef5 --- /dev/null +++ b/test/ocf/common.sh @@ -0,0 +1,29 @@ + +source $rootdir/scripts/common.sh +source $rootdir/test/common/autotest_common.sh + +rpc_py=$rootdir/scripts/rpc.py + +function nvme_cfg() { + if [ -z "$ocf_nvme_cfg" ]; then + ocf_nvme_cfg=$($rootdir/scripts/gen_nvme.sh) + fi + echo "$ocf_nvme_cfg" +} + +function clear_nvme() +{ + bdf=$($rootdir/scripts/gen_nvme.sh --json | jq '.config[0].params.traddr' | sed s/\"//g) + + # Clear metadata on NVMe device + $rootdir/scripts/setup.sh reset + sleep 5 + name=$(get_nvme_name_from_bdf $bdf) + mountpoints=$(lsblk /dev/$name --output MOUNTPOINT -n | wc -w) + if [ "$mountpoints" != "0" ]; then + $rootdir/scripts/setup.sh + exit 1 + fi + dd if=/dev/zero of=/dev/$name bs=1M count=1000 oflag=direct + $rootdir/scripts/setup.sh +} diff --git a/test/ocf/integrity/fio-modes.sh b/test/ocf/integrity/fio-modes.sh index 114ff33e1..6bbc38356 100755 --- a/test/ocf/integrity/fio-modes.sh +++ b/test/ocf/integrity/fio-modes.sh @@ -2,9 +2,8 @@ curdir=$(dirname $(readlink -f "${BASH_SOURCE[0]}")) rootdir=$(readlink -f $curdir/../../..) -plugindir=$rootdir/examples/bdev/fio_plugin -source $rootdir/test/common/autotest_common.sh +source $rootdir/test/ocf/common.sh function fio_verify(){ fio_bdev $curdir/test.fio --aux-path=/tmp/ --ioengine=spdk_bdev "$@" @@ -14,33 +13,15 @@ function cleanup(){ rm -f $curdir/modes.conf } -function clear_nvme() -{ - # Clear metadata on NVMe device - $rootdir/scripts/setup.sh reset - sleep 5 - name=$(get_nvme_name_from_bdf $1) - - mountpoints=$(lsblk /dev/$name --output MOUNTPOINT -n | wc -w) - if [ "$mountpoints" != "0" ]; then - $rootdir/scripts/setup.sh - exit 1 - fi - dd if=/dev/zero of=/dev/$name bs=1M count=1000 oflag=direct - $rootdir/scripts/setup.sh -} - -# Clear only nvme device which we will use in test -bdf=$($rootdir/scripts/gen_nvme.sh --json | jq '.config[0].params.traddr' | sed s/\"//g) - -clear_nvme "$bdf" +# Clear nvme device which we will use in test +clear_nvme trap "cleanup; exit 1" SIGINT SIGTERM EXIT nvme_cfg=$($rootdir/scripts/gen_nvme.sh) config=" -$nvme_cfg +$(nvme_cfg) [Split] Split Nvme0n1 8 101 diff --git a/test/ocf/management/persistent-metadata.sh b/test/ocf/management/persistent-metadata.sh index cd7315bf6..b3ebb8330 100755 --- a/test/ocf/management/persistent-metadata.sh +++ b/test/ocf/management/persistent-metadata.sh @@ -2,41 +2,18 @@ curdir=$(dirname $(readlink -f "${BASH_SOURCE[0]}")) rootdir=$(readlink -f $curdir/../../..) -source $rootdir/scripts/common.sh -source $rootdir/test/common/autotest_common.sh - -function clear_nvme() -{ - # Clear metadata on NVMe device - $rootdir/scripts/setup.sh reset - sleep 5 - name=$(get_nvme_name_from_bdf $1) - mountpoints=$(lsblk /dev/$name --output MOUNTPOINT -n | wc -w) - if [ "$mountpoints" != "0" ]; then - $rootdir/scripts/setup.sh - exit 1 - fi - dd if=/dev/zero of=/dev/$name bs=1M count=1000 oflag=direct - $rootdir/scripts/setup.sh -} - -rpc_py=$rootdir/scripts/rpc.py - -$rootdir/scripts/setup.sh -nvme_cfg=$($rootdir/scripts/gen_nvme.sh) +source $rootdir/test/ocf/common.sh config=" -$nvme_cfg +$(nvme_cfg) [Split] Split Nvme0n1 7 128 " echo "$config" > $curdir/config -# Clear only nvme device which we will use in test -bdf=$($rootdir/scripts/gen_nvme.sh --json | jq '.config[0].params.traddr' | sed s/\"//g) - -clear_nvme $bdf +# Clear nvme device which we will use in test +clear_nvme $rootdir/app/iscsi_tgt/iscsi_tgt -c $curdir/config & spdk_pid=$!