From e2e7f819b9a5d5788f656ce0dcb037767cd02286 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Wed, 8 Sep 2021 13:31:11 -0700 Subject: [PATCH] test/nvmf: Add detach_controller calls to multicontroller.sh This test will expand with more ways to add second paths, so we need to remove the ones we add right after they're added. Change-Id: Ie95ba01176cdedd858a98306f876d2d253a1c8cc Signed-off-by: Ben Walker Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9454 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Shuhei Matsumoto Reviewed-by: Dong Yi --- test/nvmf/host/multicontroller.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/nvmf/host/multicontroller.sh b/test/nvmf/host/multicontroller.sh index 8d848ee90..a2e3c6c06 100755 --- a/test/nvmf/host/multicontroller.sh +++ b/test/nvmf/host/multicontroller.sh @@ -54,6 +54,10 @@ NOT $rpc_py -s $bdevperf_rpc_sock bdev_nvme_attach_controller -b NVMe0 -t $TEST_ $rpc_py -s $bdevperf_rpc_sock bdev_nvme_attach_controller -b NVMe0 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP \ -s $NVMF_SECOND_PORT -f ipv4 -n nqn.2016-06.io.spdk:cnode1 +# Remove the second path +$rpc_py -s $bdevperf_rpc_sock bdev_nvme_detach_controller NVMe0 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP \ + -s $NVMF_SECOND_PORT -f ipv4 -n nqn.2016-06.io.spdk:cnode1 + # Add a second controller by attaching to the same subsystem from a different hostid. $rpc_py -s $bdevperf_rpc_sock bdev_nvme_attach_controller -b NVMe1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP \ -s $NVMF_SECOND_PORT -f ipv4 -n nqn.2016-06.io.spdk:cnode1 -i $NVMF_FIRST_TARGET_IP -c $NVMF_HOST_SECOND_PORT @@ -65,6 +69,9 @@ fi $rootdir/test/bdev/bdevperf/bdevperf.py -s $bdevperf_rpc_sock perform_tests +# Remove the second controller +$rpc_py -s $bdevperf_rpc_sock bdev_nvme_detach_controller NVMe1 + killprocess $bdevperf_pid $rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1