import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / test / nvmf / host / aer.sh

diff --git a/ceph/src/spdk/test/nvmf/host/aer.sh b/ceph/src/spdk/test/nvmf/host/aer.sh
index 66e597aa93bf7552ce4984bf4fd608f8477863a7..a10be117b51bf2f176fe49271d77ffc945a5a678 100755 (executable)
--- a/ceph/src/spdk/test/nvmf/host/aer.sh
+++ b/ceph/src/spdk/test/nvmf/host/aer.sh
@@ -9,56 +9,33 @@ rpc_py="$rootdir/scripts/rpc.py"
 
 set -e
 
-RDMA_IP_LIST=$(get_available_rdma_ips)
-NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
-if [ -z $NVMF_FIRST_TARGET_IP ]; then
-       echo "no NIC for nvmf test"
-       exit 0
-fi
-
 timing_enter aer
-timing_enter start_nvmf_tgt
-
-$NVMF_APP -m 0xF &
-nvmfpid=$!
-
-trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
+nvmftestinit
+nvmfappstart "-m 0xF"
 
-waitforlisten $nvmfpid
-$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
-timing_exit start_nvmf_tgt
-
-modprobe -v nvme-rdma
+$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192
 
 $rpc_py construct_malloc_bdev 64 512 --name Malloc0
 $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001 -m 2
 $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc0
-$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT
+$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT
 
 $rpc_py get_nvmf_subsystems
 
-# TODO: this aer test tries to invoke an AER completion by setting the temperature
-#threshold to a very low value.  This does not work with emulated controllers
-#though so currently the test is disabled.
-
-#$rootdir/test/nvme/aer/aer -r "\
-#        trtype:RDMA \
-#        adrfam:IPv4 \
-#        traddr:$NVMF_FIRST_TARGET_IP \
-#        trsvcid:$NVMF_PORT \
-#        subnqn:nqn.2014-08.org.nvmexpress.discovery"
+AER_TOUCH_FILE=/tmp/aer_touch_file
+rm -f $AER_TOUCH_FILE
 
 # Namespace Attribute Notice Tests
 $rootdir/test/nvme/aer/aer -r "\
-        trtype:RDMA \
+        trtype:$TEST_TRANSPORT \
         adrfam:IPv4 \
         traddr:$NVMF_FIRST_TARGET_IP \
         trsvcid:$NVMF_PORT \
-        subnqn:nqn.2016-06.io.spdk:cnode1" -n 2 &
+        subnqn:nqn.2016-06.io.spdk:cnode1" -n 2 -t $AER_TOUCH_FILE &
 aerpid=$!
 
 # Waiting for aer start to work
-sleep 5
+waitforfile $AER_TOUCH_FILE
 
 # Add a new namespace
 $rpc_py construct_malloc_bdev 64 4096 --name Malloc1
@@ -74,5 +51,5 @@ $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
 trap - SIGINT SIGTERM EXIT
 
 nvmfcleanup
-killprocess $nvmfpid
+nvmftestfini
 timing_exit aer