ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/bdev: Switch to rpc_cmd()

Browse Source 
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: I01eb2e6b6da1e633278a1998ca8982ea8a132720
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7088
Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Michal Berger 2021-03-26 14:14:30 +01:00 committed by Tomasz Zawadzki
parent 08d4dce28c
commit 31f8d52d13
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/bdev/blockdev.sh
View File

@ -5,7 +5,7 @@ rootdir=$(readlink -f $testdir/../..)
source $rootdir/test/common/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $testdir/nbd_common.sh source $testdir/nbd_common.sh
rpc_py="$rootdir/scripts/rpc.py" rpc_py=rpc_cmd
conf_file="$testdir/bdev.json" conf_file="$testdir/bdev.json"
# Make sure the configuration is clean # Make sure the configuration is clean
: > "$conf_file" : > "$conf_file"
@ -39,9 +39,9 @@ function setup_bdev_conf() {
bdev_malloc_create -b Malloc5 32 512 bdev_malloc_create -b Malloc5 32 512
bdev_passthru_create -p TestPT -b Malloc3 bdev_passthru_create -p TestPT -b Malloc3
bdev_raid_create -n raid0 -z 64 -r 0 -b "Malloc4 Malloc5" bdev_raid_create -n raid0 -z 64 -r 0 -b "Malloc4 Malloc5"
bdev_set_qos_limit --rw_mbytes_per_sec 100 Malloc3
bdev_set_qos_limit --rw_ios_per_sec 20000 Malloc0
RPC RPC
$rpc_py bdev_set_qos_limit --rw_mbytes_per_sec 100 Malloc3
$rpc_py bdev_set_qos_limit --rw_ios_per_sec 20000 Malloc0
if [[ $(uname -s) != "FreeBSD" ]]; then if [[ $(uname -s) != "FreeBSD" ]]; then
dd if=/dev/zero of="$SPDK_TEST_STORAGE/aiofile" bs=2048 count=5000 dd if=/dev/zero of="$SPDK_TEST_STORAGE/aiofile" bs=2048 count=5000
"$rpc_py" bdev_aio_create "$SPDK_TEST_STORAGE/aiofile" AIO0 2048 "$rpc_py" bdev_aio_create "$SPDK_TEST_STORAGE/aiofile" AIO0 2048
@ -49,7 +49,9 @@ function setup_bdev_conf() {
} }
function setup_nvme_conf() { function setup_nvme_conf() {
"$rootdir/scripts/gen_nvme.sh" | "$rpc_py" load_subsystem_config local json
mapfile -t json < <("$rootdir/scripts/gen_nvme.sh")
"$rpc_py" load_subsystem_config -j "'${json[*]}'"
} }
function setup_gpt_conf() { function setup_gpt_conf() {
@ -112,8 +114,8 @@ function setup_crypto_qat_conf() {
bdev_malloc_create -b Malloc1 16 512 bdev_malloc_create -b Malloc1 16 512
bdev_crypto_create Malloc0 crypto_ram crypto_qat 0123456789123456 bdev_crypto_create Malloc0 crypto_ram crypto_qat 0123456789123456
bdev_crypto_create -c AES_XTS -k2 0123456789123456 Malloc1 crypto_ram3 crypto_qat 0123456789123456 bdev_crypto_create -c AES_XTS -k2 0123456789123456 Malloc1 crypto_ram3 crypto_qat 0123456789123456
bdev_get_bdevs -b Malloc1
RPC RPC
"$rpc_py" bdev_get_bdevs -b Malloc1
} }
function setup_pmem_conf() { function setup_pmem_conf() {