nvme: drop default subsysnqn argument from _nvme_{connect|disconnect}_subsys

Remove the last positional argument for
_nvme_{connect|disconnect}_subsys which most test pass in the default
subsysnqn anyway. There is little point in cluttering all the test
textual noise.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/003 b/tests/nvme/003
index 9a7c41f0856b5f28f81e916605c1dec9b01988b2..be6b4e18ec30796db1e04ac7c1c28daf2ad7c45e 100755 (executable)
--- a/tests/nvme/003
+++ b/tests/nvme/003
@@ -25,7 +25,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys nqn.2014-08.org.nvmexpress.discovery
+       _nvme_connect_subsys --subsysnqn "nqn.2014-08.org.nvmexpress.discovery"
 
        # This is ugly but checking for the absence of error messages is ...
        sleep 10
@@ -38,7 +38,7 @@ test() {
                echo "Fail"
        fi
 
-       _nvme_disconnect_subsys nqn.2014-08.org.nvmexpress.discovery
+       _nvme_disconnect_subsys --subsysnqn "nqn.2014-08.org.nvmexpress.discovery"
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/004 b/tests/nvme/004
index 024ac986e5c15b41db494bd4576655eb51ec4764..b751746c6c91c60befff6aeebdce9a229307cdaa 100755 (executable)
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -24,13 +24,13 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        local nvmedev
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
 
-       _nvme_disconnect_subsys ${def_subsysnqn}
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/005 b/tests/nvme/005
index 80a5359e862e32005c37f68ead7d98ed462f5367..f17174d40dfc21c51a22249b60dab37292c0aa8e 100755 (executable)
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -25,7 +25,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 

diff --git a/tests/nvme/008 b/tests/nvme/008
index fb1726723d433fab8e7a7f5301aa71b5ffe497a4..a5d06818c6e403db950ae43678a856f723e04934 100755 (executable)
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -24,12 +24,12 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/009 b/tests/nvme/009
index a9d83b675ba28ee6782e7415c76f5233a9141409..a1655d43e56fe7358118f3ce041df2c71d893584 100755 (executable)
--- a/tests/nvme/009
+++ b/tests/nvme/009
@@ -23,12 +23,12 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/010 b/tests/nvme/010
index 496f6e5c6a52a4224c2620e01121c1d3879328fa..7d875989a01c28b51f78b2b7e2178d7c92993f1f 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -32,7 +32,7 @@ test() {
        _run_fio_verify_io --size="${nvme_img_size}" \
                --filename="/dev/${nvmedev}n1"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/011 b/tests/nvme/011
index 14a17a774d5fa1977c098808d64c83de14cc8989..0acc8b1dbaed9b93ea02f4dcd602361176109cfd 100755 (executable)
--- a/tests/nvme/011
+++ b/tests/nvme/011
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -32,7 +32,7 @@ test() {
        _run_fio_verify_io --size="${nvme_img_size}" \
                --filename="/dev/${nvmedev}n1"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/012 b/tests/nvme/012
index 8dbf8eb1a9f0ed33fc407fcc828f185f6716e533..a0bff298ab2938a6867f6d0d47cf1ee628f36453 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -28,7 +28,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -37,7 +37,7 @@ test() {
                echo "FAIL: fio verify failed"
        fi
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/013 b/tests/nvme/013
index eb22933fdec6807c480c42567052d35c27b08b44..5e5026eabe17985455437087a1b1a79386f8d844 100755 (executable)
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -27,7 +27,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -36,7 +36,7 @@ test() {
                echo "FAIL: fio verify failed"
        fi
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/014 b/tests/nvme/014
index 20ff69176231b01da193b98b11ed5e2deb3fa916..da4b4c13b3478c7ea85f587117fddfeecf67381b 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -27,7 +27,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -41,7 +41,7 @@ test() {
 
        nvme flush "/dev/${nvmedev}" --namespace-id 1
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/015 b/tests/nvme/015
index 634c42c07a867f5fab43ae364bcf8bc078924c17..b82f2253c0119fc953a38ef69fc7ad2080831251 100755 (executable)
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -27,7 +27,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -41,7 +41,7 @@ test() {
 
        nvme flush "/dev/${nvmedev}n1" --namespace-id 1
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/018 b/tests/nvme/018
index 9225f7d5837754237b3972d881f83a925235198c..bd6e5e930e357dda397f72f4c5ee5274748cba8d 100755 (executable)
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -25,7 +25,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -39,7 +39,7 @@ test() {
                --block-count 0 --data-size "$bs" &>"$FULL" \
                && echo "ERROR: nvme read for out of range LBA was not rejected"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/019 b/tests/nvme/019
index 9cf9f5299305c67d6bc6aef4e8077cee75663340..4d7de8191da7ebe2a4dacffb196392e3ce38ddf7 100755 (executable)
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -26,7 +26,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -34,7 +34,7 @@ test() {
        nvme dsm "/dev/${nvmedev}" --namespace-id 1 --ad \
                --slbs "${sblk_range}" --blocks "${nblk_range}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/020 b/tests/nvme/020
index f6a204e6e4178a5c26de60b67289edd360fcfc7e..c734210c5bd903ab6bbdddbbbe0039d75bf71a03 100755 (executable)
--- a/tests/nvme/020
+++ b/tests/nvme/020
@@ -25,7 +25,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -33,7 +33,7 @@ test() {
        nvme dsm "/dev/${nvmedev}" --namespace-id 1 --ad \
                --slbs "${sblk_range}" --blocks "${nblk_range}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/021 b/tests/nvme/021
index 73e414e9db47acd916d9bee6fe1a09e830c65b18..358e209d0458711e976dfa6dac23ac11137157db 100755 (executable)
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -33,7 +33,7 @@ test() {
                echo "ERROR: device not listed"
        fi
 
-       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys >> "$FULL" 2>&1
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/022 b/tests/nvme/022
index 31435cd2e9c79e0db86a1a207cf43ff3f4037032..7ce33ddbf006d067ec056e2e07584f6ab78d6ad0 100755 (executable)
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -33,7 +33,7 @@ test() {
                echo "ERROR: reset failed"
        fi
 
-       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys >> "$FULL" 2>&1
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/023 b/tests/nvme/023
index c4c292899f32e3694a4cad685b4622fd15b75ea1..abbb35a0b58097457feeae572499e801944a791c 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -34,7 +34,7 @@ test() {
                echo "ERROR: smart-log bdev-ns failed"
        fi
 
-       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys >> "$FULL" 2>&1
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/024 b/tests/nvme/024
index b0d6f5a3c0b9b235931a421d241e6056bae3a8ea..3ee18822e26bb58b183292055b81d6595556b918 100755 (executable)
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -33,7 +33,7 @@ test() {
                >> "$FULL" 2>&1; then
                echo "ERROR: smart-log file-ns failed"
        fi
-       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys >> "$FULL" 2>&1
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/025 b/tests/nvme/025
index 107eb38ba7871707d906af7e4500c43dd02f4841..3cd62d0b4e5e581f6a4fde2288c9f70e0c4ac050 100755 (executable)
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -33,7 +33,7 @@ test() {
                echo "ERROR: effects-log failed"
        fi
 
-       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys >> "$FULL" 2>&1
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/026 b/tests/nvme/026
index ff4ff91d5d4f6f557af124b95f6cc18a13b12290..5d54b0ff3d28f23c495d951be9748cd9c6a0fb18 100755 (executable)
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -34,7 +34,7 @@ test() {
                echo "ERROR: ns-desc failed"
        fi
 
-       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys >> "$FULL" 2>&1
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/027 b/tests/nvme/027
index a15e6d6e92d07dbfdbc95d10600bc9d9a101a991..053fd58f9369465382a774e225661edfa1b85181 100755 (executable)
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -33,7 +33,7 @@ test() {
                echo "ERROR: ns-rescan failed"
        fi
 
-       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys >> "$FULL" 2>&1
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/028 b/tests/nvme/028
index 41dcb6ef7a4fb5a96b90359965717e021bd33e7e..4710bba1f4164e7fca3fd24f5087ec8ec4e62c0f 100755 (executable)
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -33,7 +33,7 @@ test() {
                echo "ERROR: list-subsys"
        fi
 
-       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys >> "$FULL" 2>&1
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/029 b/tests/nvme/029
index 7bde5565b020ca52756bb3e1cbcbceec8b868b41..8dbe49ba15cc7bfbeb0b0dcdddde9e9d4d019a8c 100755 (executable)
--- a/tests/nvme/029
+++ b/tests/nvme/029
@@ -58,7 +58,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
@@ -84,7 +84,7 @@ test() {
                echo 0 > /proc/sys/vm/nr_hugepages
        fi
 
-       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys >> "$FULL" 2>&1
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/031 b/tests/nvme/031
index 19854ccb903fff108e014dcdb46b4a81950e5d9a..0bf823dbbb0d27254a893b401534e11cae77a931 100755 (executable)
--- a/tests/nvme/031
+++ b/tests/nvme/031
@@ -43,8 +43,8 @@ test() {
                _nvmet_target_setup --subsysnqn "${subsys}$i" \
                        --blkdev "${loop_dev}"
 
-               _nvme_connect_subsys "${subsys}$i"
-               _nvme_disconnect_subsys "${subsys}$i" >> "${FULL}" 2>&1
+               _nvme_connect_subsys --subsysnqn "${subsys}$i"
+               _nvme_disconnect_subsys --subsysnqn "${subsys}$i" >> "${FULL}" 2>&1
 
                _nvmet_target_cleanup --subsysnqn "${subsys}$i" \
                        --blkdev "${loop_dev}"

diff --git a/tests/nvme/033 b/tests/nvme/033
index cb120e20b573430e6d9754ea8525f44469a98d71..c0482c808d43ee74c22f59aec2773e0d0fbf8498 100755 (executable)
--- a/tests/nvme/033
+++ b/tests/nvme/033
@@ -57,7 +57,7 @@ test_device() {
 
        compare_dev_info "${nsdev}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
        _nvmet_passthru_target_cleanup "${def_subsysnqn}"
 
        echo "Test complete"

diff --git a/tests/nvme/034 b/tests/nvme/034
index 98a7db859b3606f20d8e4ff3c051c6896727ad90..8bb2d8cd8d629bc7ee9086e598a035acdc6c42a0 100755 (executable)
--- a/tests/nvme/034
+++ b/tests/nvme/034
@@ -27,7 +27,7 @@ test_device() {
 
        _run_fio_verify_io --size="${nvme_img_size}" --filename="${nsdev}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
        _nvmet_passthru_target_cleanup "${def_subsysnqn}"
 
        echo "Test complete"

diff --git a/tests/nvme/035 b/tests/nvme/035
index c17e8be6ce46e18b7b3db4dfcf4bdc822acf414a..1d1b5e4ac46e3a490fc622eff5d8c6bb0653ac51 100755 (executable)
--- a/tests/nvme/035
+++ b/tests/nvme/035
@@ -35,7 +35,7 @@ test_device() {
                echo "FAIL: fio verify failed"
        fi
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
        _nvmet_passthru_target_cleanup "${def_subsysnqn}"
 
        echo "Test complete"

diff --git a/tests/nvme/036 b/tests/nvme/036
index a1ae74fa95ea9f0725d7e88c77a769e32f044ca2..0e9c3bf3486cdeb7ce683c345caa923a02777d05 100755 (executable)
--- a/tests/nvme/036
+++ b/tests/nvme/036
@@ -29,7 +29,7 @@ test_device() {
                echo "ERROR: reset failed"
        fi
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
        _nvmet_passthru_target_cleanup "${def_subsysnqn}"
 
        echo "Test complete"

diff --git a/tests/nvme/037 b/tests/nvme/037
index eb47839a4289984792eb1c4d8284917b4430977e..159d9d990bb771fb39023ed657958ed5318a4bca 100755 (executable)
--- a/tests/nvme/037
+++ b/tests/nvme/037
@@ -25,7 +25,8 @@ test_device() {
                _nvmet_passthru_target_setup "${subsys}${i}"
                nsdev=$(_nvmet_passthru_target_connect "${subsys}${i}")
 
-               _nvme_disconnect_subsys "${subsys}${i}" >>"${FULL}" 2>&1
+               _nvme_disconnect_subsys \
+                       --subsysnqn "${subsys}${i}" >>"${FULL}" 2>&1
                _nvmet_passthru_target_cleanup "${subsys}${i}"
        done
 

diff --git a/tests/nvme/040 b/tests/nvme/040
index 06d0d0d47368ae15069a68b583dab1e0b71a42c4..f00fc16b643fc81423c44119a1fa1dcaf529691d 100755 (executable)
--- a/tests/nvme/040
+++ b/tests/nvme/040
@@ -26,7 +26,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${def_subsysnqn}"
+       _nvme_connect_subsys
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 
        # start fio job

diff --git a/tests/nvme/041 b/tests/nvme/041
index 02452fd52628e424cfb4391697b7c80a64e0026d..d6845628726ebb0a29aa8d10fa125fb9b33babfc 100755 (executable)
--- a/tests/nvme/041
+++ b/tests/nvme/041
@@ -38,20 +38,18 @@ test() {
 
        # Test unauthenticated connection (should fail)
        echo "Test unauthenticated connection (should fail)"
-       _nvme_connect_subsys "${def_subsysnqn}" \
-                            --hostnqn "${def_hostnqn}" \
+       _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
                             --hostid "${def_hostid}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        # Test authenticated connection
        echo "Test authenticated connection"
-       _nvme_connect_subsys "${def_subsysnqn}" \
-                            --hostnqn "${def_hostnqn}" \
+       _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
                             --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/042 b/tests/nvme/042
index 961301ff69930af0aa1f3b02cea3f41fff853ef9..480e1cba9d19b2b98730a778c8266c3fa905ddd1 100755 (executable)
--- a/tests/nvme/042
+++ b/tests/nvme/042
@@ -41,12 +41,11 @@ test() {
                fi
                _set_nvmet_hostkey "${def_hostnqn}" "${hostkey}"
 
-               _nvme_connect_subsys "${def_subsysnqn}" \
-                                    --hostnqn "${def_hostnqn}" \
+               _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
                                     --hostid "${def_hostid}" \
                                     --dhchap-secret "${hostkey}"
 
-               _nvme_disconnect_subsys "${def_subsysnqn}"
+               _nvme_disconnect_subsys
        done
 
        for key_len in 32 48 64; do
@@ -58,12 +57,11 @@ test() {
                fi
                _set_nvmet_hostkey "${def_hostnqn}" "${hostkey}"
 
-               _nvme_connect_subsys "${def_subsysnqn}" \
-                                    --hostnqn "${def_hostnqn}" \
+               _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
                                     --hostid "${def_hostid}" \
                                     --dhchap-secret "${hostkey}"
 
-               _nvme_disconnect_subsys "${def_subsysnqn}"
+               _nvme_disconnect_subsys
        done
 
        _nvmet_target_cleanup

diff --git a/tests/nvme/043 b/tests/nvme/043
index ed18869a5977f21e5ea170a322c669897344ab34..dd48035dd967a4ca7c4ff9d8868a0e038232f74a 100755 (executable)
--- a/tests/nvme/043
+++ b/tests/nvme/043
@@ -45,12 +45,11 @@ test() {
 
                _set_nvmet_hash "${def_hostnqn}" "${hash}"
 
-               _nvme_connect_subsys "${def_subsysnqn}" \
-                                    --hostnqn "${def_hostnqn}" \
+               _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
                                     --hostid "${def_hostid}" \
                                     --dhchap-secret "${hostkey}"
 
-               _nvme_disconnect_subsys "${def_subsysnqn}"
+               _nvme_disconnect_subsys
        done
 
        for dhgroup in "ffdhe2048" "ffdhe3072" "ffdhe4096" "ffdhe6144" "ffdhe8192" ; do
@@ -59,12 +58,11 @@ test() {
 
                _set_nvmet_dhgroup "${def_hostnqn}" "${dhgroup}"
 
-               _nvme_connect_subsys "${def_subsysnqn}" \
-                                     --hostnqn "${def_hostnqn}" \
+               _nvme_connect_subsys  --hostnqn "${def_hostnqn}" \
                                      --hostid "${def_hostid}" \
                                      --dhchap-secret "${hostkey}"
 
-               _nvme_disconnect_subsys "${def_subsysnqn}"
+               _nvme_disconnect_subsys
        done
 
        _nvmet_target_cleanup

diff --git a/tests/nvme/044 b/tests/nvme/044
index 8e2b4131b9690a88cc9b72918d138d1f187a43a8..624b832c0cc6f551dbfe1f55bd76434d24abda5e 100755 (executable)
--- a/tests/nvme/044
+++ b/tests/nvme/044
@@ -49,46 +49,42 @@ test() {
 
        # Step 1: Connect with host authentication only
        echo "Test host authentication"
-       _nvme_connect_subsys "${def_subsysnqn}" \
-                            --hostnqn "${def_hostnqn}" \
+       _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
                             --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        # Step 2: Connect with host authentication
        # and invalid ctrl authentication
        echo "Test invalid ctrl authentication (should fail)"
-       _nvme_connect_subsys "${def_subsysnqn}" \
-                            --hostnqn "${def_hostnqn}" \
+       _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
                             --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}" \
                             --dhchap-ctrl-secret "${hostkey}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        # Step 3: Connect with host authentication
        # and valid ctrl authentication
        echo "Test valid ctrl authentication"
-       _nvme_connect_subsys "${def_subsysnqn}" \
-                            --hostnqn "${def_hostnqn}" \
+       _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
                             --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}" \
                             --dhchap-ctrl-secret "${ctrlkey}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        # Step 4: Connect with host authentication
        # and invalid ctrl key
        echo "Test invalid ctrl key (should fail)"
        invkey="DHHC-1:00:Jc/My1o0qtLCWRp+sHhAVafdfaS7YQOMYhk9zSmlatobqB8C:"
-       _nvme_connect_subsys "${def_subsysnqn}" \
-                            --hostnqn "${def_hostnqn}" \
+       _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
                             --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}" \
                             --dhchap-ctrl-secret "${invkey}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvme_disconnect_subsys
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/045 b/tests/nvme/045
index f89378836e67553ae37f8d95caea7b620ffe69cf..3a5df7c0946c65cfa1b70ddbf42ddb7f070559fb 100755 (executable)
--- a/tests/nvme/045
+++ b/tests/nvme/045
@@ -51,8 +51,7 @@ test() {
 
        _set_nvmet_dhgroup "${def_hostnqn}" "ffdhe2048"
 
-       _nvme_connect_subsys "${def_subsysnqn}" \
-                            --hostnqn "${def_hostnqn}" \
+       _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
                             --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}" \
                             --dhchap-ctrl-secret "${ctrlkey}"
@@ -108,8 +107,7 @@ test() {
        rand_io_size="$(_nvme_calc_rand_io_size 4m)"
        _run_fio_rand_io --size="${rand_io_size}" --filename="/dev/${nvmedev}n1"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}"
-
+       _nvme_disconnect_subsys
        _nvmet_target_cleanup
 
        echo "Test complete"

diff --git a/tests/nvme/047 b/tests/nvme/047
index 162bd3bf70fa9cfb74645cdbcbbf98a2bb2664b8..75aad7d06a36f7bfdd039c32196f6f9a171c5881 100755 (executable)
--- a/tests/nvme/047
+++ b/tests/nvme/047
@@ -35,15 +35,15 @@ test() {
        rand_io_size="$(_nvme_calc_rand_io_size 4M)"
        _run_fio_rand_io --filename="/dev/${nvmedev}n1" --size="${rand_io_size}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys >> "$FULL" 2>&1
 
-       _nvme_connect_subsys "${def_subsysnqn}" \
+       _nvme_connect_subsys \
                --nr-write-queues 1 \
                --nr-poll-queues 1 || echo FAIL
 
        _run_fio_rand_io --filename="/dev/${nvmedev}n1" --size="${rand_io_size}"
 
-       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys >> "$FULL" 2>&1
 
        _nvmet_target_cleanup
 

diff --git a/tests/nvme/048 b/tests/nvme/048
index 44fdffe287c8704e078a86d6decfa2900b14ccea..79620e0d08797c06ded40b7a4a2c1a02db621519 100755 (executable)
--- a/tests/nvme/048
+++ b/tests/nvme/048
@@ -99,11 +99,10 @@ test() {
        _nvmet_target_setup --blkdev file
 
        if [[ -f "${cfs_path}/attr_qid_max" ]] ; then
-               _nvme_connect_subsys "${def_subsysnqn}" \
-                                       --hostnqn "${def_hostnqn}" \
-                                       --hostid "${def_hostid}" \
-                                       --keep-alive-tmo 1 \
-                                       --reconnect-delay 2
+               _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
+                                    --hostid "${def_hostid}" \
+                                    --keep-alive-tmo 1 \
+                                    --reconnect-delay 2
 
                if ! nvmf_wait_for_state "${def_subsysnqn}" "live" ; then
                        echo FAIL
@@ -112,7 +111,7 @@ test() {
                        set_qid_max "${def_subsysnqn}" 2 || echo FAIL
                fi
 
-               _nvme_disconnect_subsys "${def_subsysnqn}"
+               _nvme_disconnect_subsys
        else
                SKIP_REASONS+=("missing attr_qid_max feature")
                skipped=true

diff --git a/tests/nvme/rc b/tests/nvme/rc
index 1dd1072f9ffb721c48e2853a083d89bf899aeef9..6493aa30adef7f60948ca210caaab3b12d6d1fa5 100644 (file)
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -400,15 +400,27 @@ _nvme_disconnect_ctrl() {
 }
 
 _nvme_disconnect_subsys() {
-       local subsysnqn="$1"
+       local subsysnqn="$def_subsysnqn"
+
+       while [[ $# -gt 0 ]]; do
+               case $1 in
+                       --subsysnqn)
+                               subsysnqn="$2"
+                               shift 2
+                               ;;
+                       *)
+                               echo "WARNING: unknown argument: $1"
+                               shift
+                               ;;
+               esac
+       done
 
        nvme disconnect --nqn "${subsysnqn}" |& tee -a "$FULL" |
                grep -o "disconnected.*"
 }
 
 _nvme_connect_subsys() {
-       local positional_args=()
-       local subsysnqn=""
+       local subsysnqn="$def_subsysnqn"
        local hostnqn="$def_hostnqn"
        local hostid="$def_hostid"
        local hostkey=""
@@ -424,6 +436,10 @@ _nvme_connect_subsys() {
 
        while [[ $# -gt 0 ]]; do
                case $1 in
+                       --subsysnqn)
+                               subsysnqn="$2"
+                               shift 2
+                               ;;
                        --hostnqn)
                                hostnqn="$2"
                                shift 2
@@ -469,16 +485,12 @@ _nvme_connect_subsys() {
                                shift 1
                                ;;
                        *)
-                               positional_args+=("$1")
+                               echo "WARNING: unknown argument: $1"
                                shift
                                ;;
                esac
        done
 
-       set -- "${positional_args[@]}"
-
-       subsysnqn="$1"
-
        ARGS=(--transport "${nvme_trtype}" --nqn "${subsysnqn}")
        if [[ "${nvme_trtype}" == "fc" ]] ; then
                ARGS+=(--traddr "${def_traddr}" --host-traddr "${def_host_traddr}")
@@ -899,7 +911,7 @@ _nvmet_passthru_target_setup() {
 _nvmet_passthru_target_connect() {
        local subsys_name=$1
 
-       _nvme_connect_subsys "${subsys_name}" --no-wait || return
+       _nvme_connect_subsys --subsysnqn "${subsys_name}" --no-wait || return
        nsdev=$(_find_nvme_passthru_loop_dev "${subsys_name}")
 
        # The following tests can race with the creation