diff --git a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh index 0f761a2e9..2f00b7a52 100755 --- a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh +++ b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh @@ -69,8 +69,8 @@ nvmfpid=$! echo "NVMf target launched. pid: $nvmfpid" trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 echo "NVMf target has started." bdevs=$($rpc_py construct_malloc_bdev 64 512) $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001 diff --git a/test/nvmf/bdev_io_wait/bdev_io_wait.sh b/test/nvmf/bdev_io_wait/bdev_io_wait.sh index 326e02b43..29106bde7 100755 --- a/test/nvmf/bdev_io_wait/bdev_io_wait.sh +++ b/test/nvmf/bdev_io_wait/bdev_io_wait.sh @@ -32,10 +32,10 @@ nvmfpid=$! trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py set_nvmf_target_options -u 8192 -p 4 # Minimal number of bdev io pool (5) and cache (1) $rpc_py set_bdev_options -p 5 -c 1 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 timing_exit start_nvmf_tgt modprobe -v nvme-rdma diff --git a/test/nvmf/discovery/discovery.sh b/test/nvmf/discovery/discovery.sh index f6f0c3142..c68ac432e 100755 --- a/test/nvmf/discovery/discovery.sh +++ b/test/nvmf/discovery/discovery.sh @@ -37,8 +37,8 @@ nvmfpid=$! trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 timing_exit start_nvmf_tgt null_bdevs="$($rpc_py construct_null_bdev Null0 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE) " diff --git a/test/nvmf/filesystem/filesystem.sh b/test/nvmf/filesystem/filesystem.sh index 3cce01074..a00053ec2 100755 --- a/test/nvmf/filesystem/filesystem.sh +++ b/test/nvmf/filesystem/filesystem.sh @@ -33,8 +33,8 @@ for incapsule in 0 4096; do trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid - $rpc_py set_nvmf_target_options -u 8192 -p 4 -c $incapsule $rpc_py start_subsystem_init + $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 -c $incapsule bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)" bdevs+=" $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)" diff --git a/test/nvmf/fio/fio.sh b/test/nvmf/fio/fio.sh index a6b861c2c..86a129102 100755 --- a/test/nvmf/fio/fio.sh +++ b/test/nvmf/fio/fio.sh @@ -32,8 +32,9 @@ nvmfpid=$! trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 + timing_exit start_nvmf_tgt malloc_bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) " diff --git a/test/nvmf/host/aer.sh b/test/nvmf/host/aer.sh index 175bb28d9..7803db3f7 100755 --- a/test/nvmf/host/aer.sh +++ b/test/nvmf/host/aer.sh @@ -25,8 +25,8 @@ nvmfpid=$! trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 timing_exit start_nvmf_tgt modprobe -v nvme-rdma diff --git a/test/nvmf/host/bdevperf.sh b/test/nvmf/host/bdevperf.sh index f17113066..f2e9b1189 100755 --- a/test/nvmf/host/bdevperf.sh +++ b/test/nvmf/host/bdevperf.sh @@ -28,8 +28,8 @@ nvmfpid=$! trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 timing_exit start_nvmf_tgt bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)" diff --git a/test/nvmf/host/fio.sh b/test/nvmf/host/fio.sh index 2a772636c..b50fb1b76 100755 --- a/test/nvmf/host/fio.sh +++ b/test/nvmf/host/fio.sh @@ -31,8 +31,8 @@ nvmfpid=$! trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 timing_exit start_nvmf_tgt bdevs="$bdevs $($rpc_py construct_malloc_bdev 64 512)" diff --git a/test/nvmf/host/identify.sh b/test/nvmf/host/identify.sh index 80209e57f..7e9bc03b7 100755 --- a/test/nvmf/host/identify.sh +++ b/test/nvmf/host/identify.sh @@ -27,8 +27,8 @@ nvmfpid=$! trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 timing_exit start_nvmf_tgt bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)" diff --git a/test/nvmf/host/perf.sh b/test/nvmf/host/perf.sh index 37a48f3d9..fc4b4487d 100755 --- a/test/nvmf/host/perf.sh +++ b/test/nvmf/host/perf.sh @@ -28,8 +28,8 @@ nvmfpid=$! trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 $rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config timing_exit start_nvmf_tgt diff --git a/test/nvmf/lvol/nvmf_lvol.sh b/test/nvmf/lvol/nvmf_lvol.sh index d64ca9b4f..e171d92d3 100755 --- a/test/nvmf/lvol/nvmf_lvol.sh +++ b/test/nvmf/lvol/nvmf_lvol.sh @@ -50,8 +50,8 @@ pid=$! trap "process_shm --id $NVMF_APP_SHM_ID; disconnect_nvmf; killprocess $pid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT waitforlisten $pid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 timing_exit start_nvmf_tgt modprobe -v nvme-rdma diff --git a/test/nvmf/multiconnection/multiconnection.sh b/test/nvmf/multiconnection/multiconnection.sh index 702df79bf..fda2145de 100755 --- a/test/nvmf/multiconnection/multiconnection.sh +++ b/test/nvmf/multiconnection/multiconnection.sh @@ -41,8 +41,8 @@ pid=$! trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $pid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT waitforlisten $pid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 timing_exit start_nvmf_tgt modprobe -v nvme-rdma diff --git a/test/nvmf/nmic/nmic.sh b/test/nvmf/nmic/nmic.sh index 3b952e0f3..6133c29b5 100755 --- a/test/nvmf/nmic/nmic.sh +++ b/test/nvmf/nmic/nmic.sh @@ -33,8 +33,8 @@ pid=$! trap "killprocess $pid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT waitforlisten $pid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 timing_exit start_nvmf_tgt # Create subsystems diff --git a/test/nvmf/nvme_cli/nvme_cli.sh b/test/nvmf/nvme_cli/nvme_cli.sh index 87c5d2219..3d1c1afde 100755 --- a/test/nvmf/nvme_cli/nvme_cli.sh +++ b/test/nvmf/nvme_cli/nvme_cli.sh @@ -38,8 +38,8 @@ nvmfpid=$! trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 timing_exit start_nvmf_tgt bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) " diff --git a/test/nvmf/rpc/rpc.sh b/test/nvmf/rpc/rpc.sh index 0c135ac64..467b1e9e6 100755 --- a/test/nvmf/rpc/rpc.sh +++ b/test/nvmf/rpc/rpc.sh @@ -29,8 +29,8 @@ pid=$! trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $pid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT waitforlisten $pid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 timing_exit start_nvmf_tgt # set times for subsystem construct/delete diff --git a/test/nvmf/shutdown/shutdown.sh b/test/nvmf/shutdown/shutdown.sh index 923364182..d271cd24f 100755 --- a/test/nvmf/shutdown/shutdown.sh +++ b/test/nvmf/shutdown/shutdown.sh @@ -32,8 +32,8 @@ pid=$! trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $pid; nvmfcleanup; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT waitforlisten $pid -$rpc_py set_nvmf_target_options -u 8192 -p 4 $rpc_py start_subsystem_init +$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 timing_exit start_nvmf_tgt num_subsystems=10 diff --git a/test/vhost/migration/migration-tc2.sh b/test/vhost/migration/migration-tc2.sh index 0750d6e8a..ae534e47a 100644 --- a/test/vhost/migration/migration-tc2.sh +++ b/test/vhost/migration/migration-tc2.sh @@ -97,8 +97,8 @@ function migration_tc2_configure_vhost() local nvmf_tgt_pid=$! echo $nvmf_tgt_pid > $nvmf_dir/nvmf_tgt.pid waitforlisten "$nvmf_tgt_pid" "$nvmf_dir/rpc.sock" - $rpc_nvmf set_nvmf_target_options -u 8192 -p 4 $rpc_nvmf start_subsystem_init + $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 $SPDK_BUILD_DIR/scripts/gen_nvme.sh --json | $rpc_nvmf load_subsystem_config timing_exit start_nvmf_tgt diff --git a/test/vhost/migration/migration-tc3a.sh b/test/vhost/migration/migration-tc3a.sh index 5ee4c4ede..7dfca2027 100644 --- a/test/vhost/migration/migration-tc3a.sh +++ b/test/vhost/migration/migration-tc3a.sh @@ -105,8 +105,8 @@ function host1_start_nvmf() nvmf_tgt_pid=$! echo $nvmf_tgt_pid > $nvmf_dir/nvmf_tgt.pid waitforlisten "$nvmf_tgt_pid" "$nvmf_dir/nvmf_rpc.sock" - $rpc_nvmf set_nvmf_target_options -u 8192 -p 4 $rpc_nvmf start_subsystem_init + $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 $SPDK_BUILD_DIR/scripts/gen_nvme.sh --json | $rpc_nvmf load_subsystem_config $rpc_nvmf nvmf_subsystem_create nqn.2018-02.io.spdk:cnode1 -a -s SPDK01