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

scripts: fix PYTHONPATH references to scripts/ directory

Browse Source 
After 7610bc38d, python modules are now located in the python/
directory.  That patch also updated PYTHONPATH assignment in most of the
scripts, but one of the perf script and some docs/messages were missed.

Change-Id: Iff3588526f2a382e599f5734d38fc32c15a7bf56
Signed-off-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12223
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Konrad Sztyber 2022-04-12 08:33:06 +02:00 committed by Jim Harris
parent ac0c53ae58
commit 6e8e184bca
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/perf/nvmf/README.md
View File

@ -370,18 +370,18 @@ Run the script on the NVMe-oF target system:
``` ~sh
cd spdk
sudo PYTHONPATH=$PYTHONPATH:$PWD/scripts scripts/perf/nvmf/run_nvmf.py
sudo PYTHONPATH=$PYTHONPATH:$PWD/python scripts/perf/nvmf/run_nvmf.py
```
By default script uses config.json configuration file in the scripts/perf/nvmf
directory. You can specify a different configuration file at runtime as below:
``` ~sh
sudo PYTHONPATH=$PYTHONPATH:$PWD/scripts scripts/perf/nvmf/run_nvmf.py -c /path/to/config.json
sudo PYTHONPATH=$PYTHONPATH:$PWD/python scripts/perf/nvmf/run_nvmf.py -c /path/to/config.json
```
PYTHONPATH environment variable is needed because script uses SPDK-local Python
modules. If you'd like to get rid of `PYTHONPATH=$PYTHONPATH:$PWD/scripts`
modules. If you'd like to get rid of `PYTHONPATH=$PYTHONPATH:$PWD/python`
you need to modify your environment so that Python interpreter is aware of
`spdk/scripts` directory.

2
test/app/fuzz/common/fuzz_rpc.py
View File

@ -45,7 +45,7 @@ def _fuzz_vhost_create_dev(client, socket, is_blk, use_bogus_buffer, use_valid_b
if __name__ == "__main__":
parser = argparse.ArgumentParser(
description='SPDK RPC command line interface. NOTE: spdk/scripts/ is expected in PYTHONPATH')
description='SPDK RPC command line interface. NOTE: spdk/python is expected in PYTHONPATH')
parser.add_argument('-s', dest='server_addr',
help='RPC domain socket path or IP address', default='/var/tmp/spdk.sock')
parser.add_argument('-p', dest='port',

6
test/bdev/bdevio/tests.py
View File

@ -8,8 +8,8 @@ try:
from spdk.rpc.client import print_dict, JSONRPCException
import spdk.rpc as rpc
except ImportError:
print("SPDK RPC library missing. Please add spdk/scripts/ directory to PYTHONPATH:")
print("'export PYTHONPATH=$PYTHONPATH:./spdk/scripts/'")
print("SPDK RPC library missing. Please add spdk/python directory to PYTHONPATH:")
print("'export PYTHONPATH=$PYTHONPATH:spdk/python'")
exit(1)
try:
@ -39,7 +39,7 @@ def perform_tests_func(client, name=None):
if __name__ == "__main__":
parser = argparse.ArgumentParser(
description='SPDK RPC command line interface. NOTE: spdk/scripts/ is expected in PYTHONPATH')
description='SPDK RPC command line interface. NOTE: spdk/python is expected in PYTHONPATH')
parser.add_argument('-s', dest='server_addr',
help='RPC domain socket path or IP address', default='/var/tmp/spdk.sock')
parser.add_argument('-p', dest='port',

6
test/bdev/bdevperf/bdevperf.py
View File

@ -9,8 +9,8 @@ try:
from spdk.rpc.client import print_dict, JSONRPCException
import spdk.rpc as rpc
except ImportError:
print("SPDK RPC library missing. Please add spdk/scripts/ directory to PYTHONPATH:")
print("'export PYTHONPATH=$PYTHONPATH:./spdk/scripts/'")
print("SPDK RPC library missing. Please add spdk/python directory to PYTHONPATH:")
print("'export PYTHONPATH=$PYTHONPATH:spdk/python'")
exit(1)
try:
@ -38,7 +38,7 @@ def perform_tests_func(client):
if __name__ == "__main__":
parser = argparse.ArgumentParser(
description='SPDK RPC command line interface. NOTE: spdk/scripts/ is expected in PYTHONPATH')
description='SPDK RPC command line interface. NOTE: spdk/python is expected in PYTHONPATH')
parser.add_argument('-s', dest='server_addr',
help='RPC domain socket path or IP address', default='/var/tmp/spdk.sock')
parser.add_argument('-p', dest='port',

2
test/nvme/perf/common.sh
View File

@ -440,7 +440,7 @@ function run_bdevperf() {
sleep 3
fi
PYTHONPATH=$PYTHONPATH:$rootdir/scripts $bdevperf_rpc -s "$rpc_socket" -t $((RUNTIME + 10)) perform_tests
PYTHONPATH=$PYTHONPATH:$rootdir/python $bdevperf_rpc -s "$rpc_socket" -t $((RUNTIME + 10)) perform_tests
# Using "-z" option causes bdevperf to NOT exit automatically after running the test,
# so we need to stop it ourselves.

2
test/nvmf/target/multitarget_rpc.py
View File

@ -17,7 +17,7 @@ except ImportError:
if __name__ == "__main__":
parser = argparse.ArgumentParser(
description='NVMe-oF RPC command line interface. NOTE: spdk/scripts/ is expected in PYTHONPATH')
description='NVMe-oF RPC command line interface. NOTE: spdk/python is expected in PYTHONPATH')
parser.add_argument('-s', dest='server_addr',
help='RPC domain socket path or IP address', default='/var/tmp/spdk.sock')
parser.add_argument('-p', dest='port',