Up until now, importing an SPDK RPC python module was just a matter of `import rpc`. It's fine until there's another module called `rpc` installed on the system, in which case it's impossible to import both of them. Therefore, to avoid this problem, all of the modules were moved to a separate directory under the "spdk" namespace. The decision to move to a location under a separate directory was motivated by the fact that a directory called scripts/spdk would look pretty confusing. Moreover, it should make it also easier to package these scripts as a python package. Other than moving the packages, all of the imports were updated to reflect these changes. Files under python now use relative imports, while those under scripts/ use the "spdk" namespace and have their PYTHONPATH extended with python directory. Signed-off-by: Konrad Sztyber <konrad.sztyber@intel.com> Change-Id: Ib43dee73921d590a551dd83885e22870e72451cf Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9692 Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@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>
57 lines
1.4 KiB
Bash
Executable File
57 lines
1.4 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
testdir=$(readlink -f $(dirname $0))
|
|
rootdir=$(readlink -f $testdir/../..)
|
|
source $rootdir/test/common/autotest_common.sh
|
|
|
|
# simply check if rpc commands have any effect on spdk
|
|
function rpc_integrity() {
|
|
time {
|
|
bdevs=$($rpc bdev_get_bdevs)
|
|
[ "$(jq length <<< "$bdevs")" == "0" ]
|
|
|
|
malloc=$($rpc bdev_malloc_create 8 512)
|
|
bdevs=$($rpc bdev_get_bdevs)
|
|
[ "$(jq length <<< "$bdevs")" == "1" ]
|
|
|
|
$rpc bdev_passthru_create -b "$malloc" -p Passthru0
|
|
bdevs=$($rpc bdev_get_bdevs)
|
|
[ "$(jq length <<< "$bdevs")" == "2" ]
|
|
|
|
$rpc bdev_passthru_delete Passthru0
|
|
$rpc bdev_malloc_delete $malloc
|
|
bdevs=$($rpc bdev_get_bdevs)
|
|
[ "$(jq length <<< "$bdevs")" == "0" ]
|
|
}
|
|
}
|
|
|
|
function rpc_plugins() {
|
|
time {
|
|
malloc=$($rpc --plugin rpc_plugin create_malloc)
|
|
bdevs=$($rpc bdev_get_bdevs)
|
|
[ "$(jq length <<< "$bdevs")" == "1" ]
|
|
|
|
$rpc --plugin rpc_plugin delete_malloc $malloc
|
|
bdevs=$($rpc bdev_get_bdevs)
|
|
[ "$(jq length <<< "$bdevs")" == "0" ]
|
|
}
|
|
}
|
|
|
|
$SPDK_BIN_DIR/spdk_tgt &
|
|
spdk_pid=$!
|
|
trap 'killprocess $spdk_pid; exit 1' SIGINT SIGTERM EXIT
|
|
waitforlisten $spdk_pid
|
|
|
|
export PYTHONPATH=$PYTHONPATH:$testdir
|
|
|
|
# basic integrity test
|
|
rpc=rpc_cmd
|
|
run_test "rpc_integrity" rpc_integrity
|
|
run_test "rpc_plugins" rpc_plugins
|
|
# same integrity test, but with rpc_cmd() instead
|
|
rpc="rpc_cmd"
|
|
run_test "rpc_daemon_integrity" rpc_integrity
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
killprocess $spdk_pid
|