diff --git a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh index 406e51d33..f187805fa 100755 --- a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh +++ b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh @@ -67,7 +67,7 @@ echo "NVMf target launched. pid: $nvmfpid" trap "iscsitestfini $1 $2; nvmftestfini; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid $rpc_py start_subsystem_init -$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 +$rpc_py nvmf_create_transport -t RDMA -u 8192 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/json_config/json_config.sh b/test/json_config/json_config.sh index 2395ca344..a596b113f 100755 --- a/test/json_config/json_config.sh +++ b/test/json_config/json_config.sh @@ -305,7 +305,7 @@ function create_nvmf_subsystem_config() { tgt_rpc construct_malloc_bdev 8 512 --name MallocForNvmf0 tgt_rpc construct_malloc_bdev 4 1024 --name MallocForNvmf1 - tgt_rpc nvmf_create_transport -t RDMA -u 8192 -p 4 -c 0 + tgt_rpc nvmf_create_transport -t RDMA -u 8192 -c 0 tgt_rpc nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001 tgt_rpc nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 MallocForNvmf0 tgt_rpc nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 MallocForNvmf1 diff --git a/test/nvmf/host/aer.sh b/test/nvmf/host/aer.sh index 96242187b..60c8b75ad 100755 --- a/test/nvmf/host/aer.sh +++ b/test/nvmf/host/aer.sh @@ -29,7 +29,7 @@ nvmfpid=$! trap "process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 +$rpc_py nvmf_create_transport -t RDMA -u 8192 timing_exit start_nvmf_tgt modprobe -v nvme-rdma diff --git a/test/nvmf/host/bdevperf.sh b/test/nvmf/host/bdevperf.sh index e7bdaa3f3..a1f496afc 100755 --- a/test/nvmf/host/bdevperf.sh +++ b/test/nvmf/host/bdevperf.sh @@ -32,7 +32,7 @@ nvmfpid=$! trap "process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 +$rpc_py nvmf_create_transport -t RDMA -u 8192 timing_exit start_nvmf_tgt $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0 diff --git a/test/nvmf/host/fio.sh b/test/nvmf/host/fio.sh index d78f86ed6..7ca7b2faa 100755 --- a/test/nvmf/host/fio.sh +++ b/test/nvmf/host/fio.sh @@ -35,7 +35,7 @@ nvmfpid=$! trap "process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 +$rpc_py nvmf_create_transport -t RDMA -u 8192 timing_exit start_nvmf_tgt $rpc_py construct_malloc_bdev 64 512 -b Malloc1 diff --git a/test/nvmf/host/identify.sh b/test/nvmf/host/identify.sh index 08fb8c81d..a3ce8e3aa 100755 --- a/test/nvmf/host/identify.sh +++ b/test/nvmf/host/identify.sh @@ -30,7 +30,7 @@ nvmfpid=$! trap "process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid -$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 +$rpc_py nvmf_create_transport -t RDMA -u 8192 timing_exit start_nvmf_tgt $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0 diff --git a/test/nvmf/host/perf.sh b/test/nvmf/host/perf.sh index 5940a7d5b..fb0e63f93 100755 --- a/test/nvmf/host/perf.sh +++ b/test/nvmf/host/perf.sh @@ -48,7 +48,7 @@ function test_perf() { TYPE=$1 NVMF_TARGET_IP=$2 - $rpc_py nvmf_create_transport -t $TYPE -p 4 + $rpc_py nvmf_create_transport -t $TYPE $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001 for bdev in $bdevs; do $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 $bdev diff --git a/test/nvmf/target/bdev_io_wait.sh b/test/nvmf/target/bdev_io_wait.sh index d5d409c5a..d729471e2 100755 --- a/test/nvmf/target/bdev_io_wait.sh +++ b/test/nvmf/target/bdev_io_wait.sh @@ -21,7 +21,7 @@ nvmfappstart "-m 0xF --wait-for-rpc" # 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 +$rpc_py nvmf_create_transport -t rdma -u 8192 $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0 $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001 diff --git a/test/nvmf/target/bdevio.sh b/test/nvmf/target/bdevio.sh index c67e42428..71f58ded1 100755 --- a/test/nvmf/target/bdevio.sh +++ b/test/nvmf/target/bdevio.sh @@ -18,7 +18,7 @@ timing_enter bdevio nvmftestinit nvmfappstart "-m 0xF" -$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 +$rpc_py nvmf_create_transport -t rdma -u 8192 $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0 $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001 $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc0 diff --git a/test/nvmf/target/connect_disconnect.sh b/test/nvmf/target/connect_disconnect.sh index dec5887e6..fed21fd70 100755 --- a/test/nvmf/target/connect_disconnect.sh +++ b/test/nvmf/target/connect_disconnect.sh @@ -20,7 +20,7 @@ timing_enter connect_disconnect nvmftestinit nvmfappstart "-m 0xF" -$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 -c 0 +$rpc_py nvmf_create_transport -t rdma -u 8192 -c 0 bdev="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)" diff --git a/test/nvmf/target/create_transport.sh b/test/nvmf/target/create_transport.sh index c4363eac9..54f54b6b2 100755 --- a/test/nvmf/target/create_transport.sh +++ b/test/nvmf/target/create_transport.sh @@ -24,7 +24,7 @@ nvmftestinit nvmfappstart "-m 0xF" # Use nvmf_create_transport call to create transport -$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 +$rpc_py nvmf_create_transport -t rdma -u 8192 null_bdevs="$($rpc_py construct_null_bdev Null0 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE) " null_bdevs+="$($rpc_py construct_null_bdev Null1 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE)" diff --git a/test/nvmf/target/discovery.sh b/test/nvmf/target/discovery.sh index 8b5569a6a..2102b32a5 100755 --- a/test/nvmf/target/discovery.sh +++ b/test/nvmf/target/discovery.sh @@ -23,7 +23,7 @@ timing_enter discovery nvmftestinit nvmfappstart "-m 0xF" -$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 +$rpc_py nvmf_create_transport -t rdma -u 8192 null_bdevs="$($rpc_py construct_null_bdev Null0 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE) " null_bdevs+="$($rpc_py construct_null_bdev Null1 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE)" diff --git a/test/nvmf/target/filesystem.sh b/test/nvmf/target/filesystem.sh index 3c3132ce8..8730fafed 100755 --- a/test/nvmf/target/filesystem.sh +++ b/test/nvmf/target/filesystem.sh @@ -21,7 +21,7 @@ nvmftestinit for incapsule in 0 4096; do nvmfappstart "-m 0xF" - $rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 -c $incapsule + $rpc_py nvmf_create_transport -t rdma -u 8192 -c $incapsule $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc1 $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001 diff --git a/test/nvmf/target/fio.sh b/test/nvmf/target/fio.sh index 381b2ced8..12219a8e1 100755 --- a/test/nvmf/target/fio.sh +++ b/test/nvmf/target/fio.sh @@ -18,7 +18,7 @@ timing_enter fio nvmftestinit nvmfappstart "-m 0xF" -$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 +$rpc_py nvmf_create_transport -t rdma -u 8192 malloc_bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) " malloc_bdevs+="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)" diff --git a/test/nvmf/target/multiconnection.sh b/test/nvmf/target/multiconnection.sh index 744217fd0..89dd85327 100755 --- a/test/nvmf/target/multiconnection.sh +++ b/test/nvmf/target/multiconnection.sh @@ -27,7 +27,7 @@ if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then NVMF_SUBSYS=1 fi -$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 +$rpc_py nvmf_create_transport -t rdma -u 8192 for i in `seq 1 $NVMF_SUBSYS` do diff --git a/test/nvmf/target/nmic.sh b/test/nvmf/target/nmic.sh index cedcda5b6..aa47b1294 100755 --- a/test/nvmf/target/nmic.sh +++ b/test/nvmf/target/nmic.sh @@ -20,7 +20,7 @@ nvmfappstart "-m 0xF" NVMF_SECOND_TARGET_IP=$(echo "$RDMA_IP_LIST" | sed -n 2p) -$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 +$rpc_py nvmf_create_transport -t rdma -u 8192 # Create subsystems $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0 diff --git a/test/nvmf/target/nvme_cli.sh b/test/nvmf/target/nvme_cli.sh index 1179858e6..afd8db42e 100755 --- a/test/nvmf/target/nvme_cli.sh +++ b/test/nvmf/target/nvme_cli.sh @@ -25,7 +25,7 @@ timing_enter nvme_cli nvmftestinit nvmfappstart "-m 0xF" -$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 +$rpc_py nvmf_create_transport -t rdma -u 8192 $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0 $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc1 diff --git a/test/nvmf/target/nvmf_lvol.sh b/test/nvmf/target/nvmf_lvol.sh index 4279a3d6c..545155578 100755 --- a/test/nvmf/target/nvmf_lvol.sh +++ b/test/nvmf/target/nvmf_lvol.sh @@ -28,7 +28,7 @@ if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then SUBSYS_NR=1 fi -$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 +$rpc_py nvmf_create_transport -t rdma -u 8192 # Construct a RAID volume for the logical volume store base_bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) " diff --git a/test/nvmf/target/rpc.sh b/test/nvmf/target/rpc.sh index c3539db3e..dee6035af 100755 --- a/test/nvmf/target/rpc.sh +++ b/test/nvmf/target/rpc.sh @@ -15,7 +15,7 @@ timing_enter rpc nvmftestinit nvmfappstart "-m 0xF" -$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 +$rpc_py nvmf_create_transport -t rdma -u 8192 # set times for subsystem construct/delete if [ $RUN_NIGHTLY -eq 1 ]; then diff --git a/test/nvmf/target/shutdown.sh b/test/nvmf/target/shutdown.sh index 29367dd88..7267a6faa 100755 --- a/test/nvmf/target/shutdown.sh +++ b/test/nvmf/target/shutdown.sh @@ -42,7 +42,7 @@ timing_enter shutdown nvmftestinit nvmfappstart "-m 0xF" -$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 +$rpc_py nvmf_create_transport -t rdma -u 8192 num_subsystems=10 # SoftRoce does not have enough queues available for diff --git a/test/vhost/migration/migration-tc2.sh b/test/vhost/migration/migration-tc2.sh index c39678aa7..2d2ecaebe 100644 --- a/test/vhost/migration/migration-tc2.sh +++ b/test/vhost/migration/migration-tc2.sh @@ -98,7 +98,7 @@ function migration_tc2_configure_vhost() echo $nvmf_tgt_pid > $nvmf_dir/nvmf_tgt.pid waitforlisten "$nvmf_tgt_pid" "$nvmf_dir/rpc.sock" $rpc_nvmf start_subsystem_init - $rpc_nvmf nvmf_create_transport -t RDMA -u 8192 -p 4 + $rpc_nvmf nvmf_create_transport -t RDMA -u 8192 $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 4af93f34b..2bbf107e3 100644 --- a/test/vhost/migration/migration-tc3a.sh +++ b/test/vhost/migration/migration-tc3a.sh @@ -106,7 +106,7 @@ function host1_start_nvmf() echo $nvmf_tgt_pid > $nvmf_dir/nvmf_tgt.pid waitforlisten "$nvmf_tgt_pid" "$nvmf_dir/nvmf_rpc.sock" $rpc_nvmf start_subsystem_init - $rpc_nvmf nvmf_create_transport -t RDMA -u 8192 -p 4 + $rpc_nvmf nvmf_create_transport -t RDMA -u 8192 $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