diff --git a/doc/iscsi.md b/doc/iscsi.md index 9e2b86949..d0074e67c 100644 --- a/doc/iscsi.md +++ b/doc/iscsi.md @@ -87,7 +87,7 @@ In addition to the configuration file, the iSCSI target may also be configured v - get_portal_groups -- Show information about all available portal groups. ~~~ -python /path/to/spdk/scripts/rpc.py add_portal_group 1 10.0.0.1:3260 +/path/to/spdk/scripts/rpc.py add_portal_group 1 10.0.0.1:3260 ~~~ ### Initiator groups @@ -98,7 +98,7 @@ python /path/to/spdk/scripts/rpc.py add_portal_group 1 10.0.0.1:3260 - get_initiator_groups -- Show information about all available initiator groups. ~~~ -python /path/to/spdk/scripts/rpc.py add_initiator_group 2 ANY 10.0.0.2/32 +/path/to/spdk/scripts/rpc.py add_initiator_group 2 ANY 10.0.0.2/32 ~~~ ### Target nodes @@ -109,7 +109,7 @@ python /path/to/spdk/scripts/rpc.py add_initiator_group 2 ANY 10.0.0.2/32 - get_target_nodes -- Show information about all available iSCSI target nodes. ~~~ -python /path/to/spdk/scripts/rpc.py construct_target_node Target3 Target3_alias MyBdev:0 1:2 64 -d +/path/to/spdk/scripts/rpc.py construct_target_node Target3 Target3_alias MyBdev:0 1:2 64 -d ~~~ ## Configuring iSCSI Initiator {#iscsi_initiator} @@ -233,27 +233,27 @@ $ ./app/iscsi_tgt/iscsi_tgt Construct two 64MB Malloc block devices with 512B sector size "Malloc0" and "Malloc1": ``` -$ python ./scripts/rpc.py construct_malloc_bdev -b Malloc0 64 512 -$ python ./scripts/rpc.py construct_malloc_bdev -b Malloc1 64 512 +$ ./scripts/rpc.py construct_malloc_bdev -b Malloc0 64 512 +$ ./scripts/rpc.py construct_malloc_bdev -b Malloc1 64 512 ``` Create new portal group with id 1, and address 10.0.0.1:3260: ``` -$ python ./scripts/rpc.py add_portal_group 1 10.0.0.1:3260 +$ ./scripts/rpc.py add_portal_group 1 10.0.0.1:3260 ``` Create one initiator group with id 2 to accept any connection from 10.0.0.2/32: ``` -$ python ./scripts/rpc.py add_initiator_group 2 ANY 10.0.0.2/32 +$ ./scripts/rpc.py add_initiator_group 2 ANY 10.0.0.2/32 ``` Finally construct one target using previously created bdevs as LUN0 (Malloc0) and LUN1 (Malloc1) with a name "disk1" and alias "Data Disk1" using portal group 1 and initiator group 2. ``` -$ python ./scripts/rpc.py construct_target_node disk1 "Data Disk1" "Malloc0:0 Malloc1:1" 1:2 64 -d +$ ./scripts/rpc.py construct_target_node disk1 "Data Disk1" "Malloc0:0 Malloc1:1" 1:2 64 -d ``` #### Configure initiator diff --git a/test/blobstore/blob_io_wait/blob_io_wait.sh b/test/blobstore/blob_io_wait/blob_io_wait.sh index 812007000..8ce3cc878 100755 --- a/test/blobstore/blob_io_wait/blob_io_wait.sh +++ b/test/blobstore/blob_io_wait/blob_io_wait.sh @@ -10,7 +10,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh -rpc_py="python $rootdir/scripts/rpc.py" +rpc_py="$rootdir/scripts/rpc.py" set -e timing_enter blob_bdev_io_wait diff --git a/test/iscsi_tgt/perf/iscsi_target.sh b/test/iscsi_tgt/perf/iscsi_target.sh index e4748540e..0acda8333 100755 --- a/test/iscsi_tgt/perf/iscsi_target.sh +++ b/test/iscsi_tgt/perf/iscsi_target.sh @@ -73,7 +73,7 @@ function ssh_initiator(){ } NETMASK=$INITIATOR_IP/32 -rpc_py="python $rootdir/scripts/rpc.py -s $testdir/rpc_iscsi.sock" +rpc_py="$rootdir/scripts/rpc.py -s $testdir/rpc_iscsi.sock" iscsi_fio_results="$testdir/perf_output/iscsi_fio.json" rm -rf $iscsi_fio_results mkdir -p $testdir/perf_output diff --git a/test/nvmf/target/create_transport.sh b/test/nvmf/target/create_transport.sh index 3514dbc10..1fe1a15df 100755 --- a/test/nvmf/target/create_transport.sh +++ b/test/nvmf/target/create_transport.sh @@ -8,7 +8,7 @@ source $rootdir/test/nvmf/common.sh NULL_BDEV_SIZE=102400 NULL_BLOCK_SIZE=512 -rpc_py="python $rootdir/scripts/rpc.py" +rpc_py="$rootdir/scripts/rpc.py" set -e diff --git a/test/nvmf/target/nmic.sh b/test/nvmf/target/nmic.sh index ecd5b5c71..5cdc4ad89 100755 --- a/test/nvmf/target/nmic.sh +++ b/test/nvmf/target/nmic.sh @@ -8,7 +8,7 @@ source $rootdir/test/nvmf/common.sh MALLOC_BDEV_SIZE=128 MALLOC_BLOCK_SIZE=512 -rpc_py="python $rootdir/scripts/rpc.py" +rpc_py="$rootdir/scripts/rpc.py" set -e diff --git a/test/ocf/integrity/bdevperf-iotypes.sh b/test/ocf/integrity/bdevperf-iotypes.sh index 4c2a67ad1..1feb05dfb 100755 --- a/test/ocf/integrity/bdevperf-iotypes.sh +++ b/test/ocf/integrity/bdevperf-iotypes.sh @@ -5,7 +5,7 @@ rootdir=$(readlink -f $curdir/../../..) source $rootdir/test/common/autotest_common.sh bdevperf=$rootdir/test/bdev/bdevperf/bdevperf -rpc_py="python $rootdir/scripts/rpc.py" +rpc_py="$rootdir/scripts/rpc.py" $bdevperf -c $curdir/mallocs.conf -q 128 -o 4096 -t 4 -w flush $bdevperf -c $curdir/mallocs.conf -q 128 -o 4096 -t 4 -w unmap diff --git a/test/vhost/vhost_boot/vhost_boot.sh b/test/vhost/vhost_boot/vhost_boot.sh index f2548969c..e95b38392 100755 --- a/test/vhost/vhost_boot/vhost_boot.sh +++ b/test/vhost/vhost_boot/vhost_boot.sh @@ -6,7 +6,7 @@ rootdir=$(readlink -f $testdir/../../..) . $testdir/../common/common.sh . $rootdir/test/bdev/nbd_common.sh -rpc_py="python $SPDK_BUILD_DIR/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock" +rpc_py="$SPDK_BUILD_DIR/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock" vm_no="0" function err_clean