update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / test / ftl / json.sh

diff --git a/ceph/src/spdk/test/ftl/json.sh b/ceph/src/spdk/test/ftl/json.sh
index d32731f64e5e1369b14f42098bea69fb5bbcb3a7..0052665f815c29a66de228c98574e8cd8d4ed674 100755 (executable)
--- a/ceph/src/spdk/test/ftl/json.sh
+++ b/ceph/src/spdk/test/ftl/json.sh
@@ -1,15 +1,13 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
-rpc_py=$rootdir/scripts/rpc.py
-
 source $rootdir/test/common/autotest_common.sh
+source $testdir/common.sh
+
+rpc_py=$rootdir/scripts/rpc.py
 
 device=$1
-FTL_BDEV_CONF=$testdir/config/ftl.json
 
 json_kill() {
        killprocess $svcpid
@@ -17,28 +15,24 @@ json_kill() {
 
 trap "json_kill; exit 1" SIGINT SIGTERM EXIT
 
-$rootdir/test/app/bdev_svc/bdev_svc & svcpid=$!
+"$SPDK_BIN_DIR/spdk_tgt" --json <(gen_ftl_nvme_conf) &
+svcpid=$!
 waitforlisten $svcpid
 
 # Create new bdev from json configuration
-$rootdir/scripts/gen_ftl.sh -j -a $device -n nvme0 -l 0-3 | $rpc_py load_subsystem_config
+$rootdir/scripts/gen_ftl.sh -n ftl0 -d nvme0n1 | $rpc_py load_subsystem_config
+$rpc_py bdev_nvme_attach_controller -b nvme0 -a $device -t pcie
+$rpc_py bdev_ocssd_create -c nvme0 -b nvme0n1 -n 1
 
-uuid=$($rpc_py get_bdevs | jq -r '.[0].uuid')
+waitforbdev ftl0
+uuid=$($rpc_py bdev_get_bdevs | jq -r ".[] | select(.name==\"ftl0\").uuid")
 
-$rpc_py delete_ftl_bdev -b nvme0
+$rpc_py bdev_ftl_delete -b ftl0
 
 # Restore bdev from json configuration
-$rootdir/scripts/gen_ftl.sh -j -a $device -n nvme0 -l 0-3 -u $uuid | $rpc_py load_subsystem_config
-# Create new bdev from json configuration
-$rootdir/scripts/gen_ftl.sh -j -a $device -n nvme1 -l 4-5 | $rpc_py load_subsystem_config
-# Create new bdev from RPC
-$rpc_py construct_ftl_bdev -b nvme2 -a $device -l 7-7
-
-$rpc_py delete_ftl_bdev -b nvme2
-$rpc_py delete_ftl_bdev -b nvme0
-$rpc_py delete_ftl_bdev -b nvme1
-
-# TODO: add negative test cases
+$rootdir/scripts/gen_ftl.sh -n ftl0 -d nvme0n1 -u $uuid | $rpc_py load_subsystem_config
+$rpc_py bdev_ftl_delete -b ftl0
+$rpc_py bdev_nvme_detach_controller nvme0
 
 trap - SIGINT SIGTERM EXIT
 json_kill