nvme: drop default trtype argument for _nvmet_connect_subsys

Every invocation of _nvmet_connect_subsys passes in the default
nvme_trtype argument. nvme/rc also assumes the test is always using
nvme_trtype for trtype (e.g. cleanup code paths), thus just drop
this argument.

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 b5ea2720100e5c141acf8f7997b04e88a85b6bd0..9a7c41f0856b5f28f81e916605c1dec9b01988b2 100755 (executable)
--- a/tests/nvme/003
+++ b/tests/nvme/003
@@ -25,7 +25,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${nvme_trtype}" nqn.2014-08.org.nvmexpress.discovery
+       _nvme_connect_subsys nqn.2014-08.org.nvmexpress.discovery
 
        # This is ugly but checking for the absence of error messages is ...
        sleep 10

diff --git a/tests/nvme/004 b/tests/nvme/004
index cc5310e78e0b7070a5818197ce78bcc5ef1d80e7..024ac986e5c15b41db494bd4576655eb51ec4764 100755 (executable)
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -22,10 +22,9 @@ test() {
 
        _setup_nvmet
 
-
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        local nvmedev
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")

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

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

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

diff --git a/tests/nvme/010 b/tests/nvme/010
index 5ed6cb5c0374817756ec702712d900839dd1bda2..496f6e5c6a52a4224c2620e01121c1d3879328fa 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/011 b/tests/nvme/011
index f9150e06434e9dd38fcbfbf1c619abe7c99a4116..14a17a774d5fa1977c098808d64c83de14cc8989 100755 (executable)
--- a/tests/nvme/011
+++ b/tests/nvme/011
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/012 b/tests/nvme/012
index f0914ce3206b238945d5e990958a298baf94c12f..8dbf8eb1a9f0ed33fc407fcc828f185f6716e533 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -28,7 +28,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/013 b/tests/nvme/013
index 3cef009cb9f462340f8fda815b41899d0488d53e..eb22933fdec6807c480c42567052d35c27b08b44 100755 (executable)
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -27,7 +27,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/014 b/tests/nvme/014
index c02167142cb3ceba1b1be3a9fba56439b76c1809..20ff69176231b01da193b98b11ed5e2deb3fa916 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -27,7 +27,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/015 b/tests/nvme/015
index 8ea90f10bda7d1a5f3085b623b8178b50378dbfb..634c42c07a867f5fab43ae364bcf8bc078924c17 100755 (executable)
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -27,7 +27,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/018 b/tests/nvme/018
index e631434d7bd69e59df709e9dba5625c3ef7cbced..9225f7d5837754237b3972d881f83a925235198c 100755 (executable)
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -25,7 +25,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/019 b/tests/nvme/019
index 3ab22e2cba01217ad8b101bb837c65e04df09c0c..9cf9f5299305c67d6bc6aef4e8077cee75663340 100755 (executable)
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -26,7 +26,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/020 b/tests/nvme/020
index 10de114b83af07da3087ddc0ae753e113e5cd577..f6a204e6e4178a5c26de60b67289edd360fcfc7e 100755 (executable)
--- a/tests/nvme/020
+++ b/tests/nvme/020
@@ -25,7 +25,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/021 b/tests/nvme/021
index 7dc6a41b9f7b75c4cac4c0a8461384e34a9a9501..73e414e9db47acd916d9bee6fe1a09e830c65b18 100755 (executable)
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/022 b/tests/nvme/022
index c70fbbae822eee84200eebda84dc3668f8893e68..31435cd2e9c79e0db86a1a207cf43ff3f4037032 100755 (executable)
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/023 b/tests/nvme/023
index 58f03e8603a7320fa2d0794ddd20dd905fdd2cae..c4c292899f32e3694a4cad685b4622fd15b75ea1 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/024 b/tests/nvme/024
index 4608f015c4c326c8276bcee37c5fd50cf9733a55..b0d6f5a3c0b9b235931a421d241e6056bae3a8ea 100755 (executable)
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/025 b/tests/nvme/025
index 46f6197cdfed0cd5ad3a8fdeecdc28f5e3a7ef50..107eb38ba7871707d906af7e4500c43dd02f4841 100755 (executable)
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/026 b/tests/nvme/026
index d5e13db0a916a031d997eec5bea74dc923fd6568..ff4ff91d5d4f6f557af124b95f6cc18a13b12290 100755 (executable)
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/027 b/tests/nvme/027
index 82b77a9636236e4fd74ab6258cebe89740b14e38..a15e6d6e92d07dbfdbc95d10600bc9d9a101a991 100755 (executable)
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/028 b/tests/nvme/028
index 0b49e2016d3023b7bb97782258baaa2cd526d0bb..41dcb6ef7a4fb5a96b90359965717e021bd33e7e 100755 (executable)
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -24,7 +24,7 @@ test() {
 
        _nvmet_target_setup --blkdev file
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

diff --git a/tests/nvme/029 b/tests/nvme/029
index a4f0cb1402b14453d5141aa1e87f040f2718d2b0..7bde5565b020ca52756bb3e1cbcbceec8b868b41 100755 (executable)
--- a/tests/nvme/029
+++ b/tests/nvme/029
@@ -58,7 +58,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"

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

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

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

diff --git a/tests/nvme/042 b/tests/nvme/042
index 815d65e7c610ea14c1eb8165d2c22d0539fa5646..961301ff69930af0aa1f3b02cea3f41fff853ef9 100755 (executable)
--- a/tests/nvme/042
+++ b/tests/nvme/042
@@ -41,7 +41,7 @@ test() {
                fi
                _set_nvmet_hostkey "${def_hostnqn}" "${hostkey}"
 
-               _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
+               _nvme_connect_subsys "${def_subsysnqn}" \
                                     --hostnqn "${def_hostnqn}" \
                                     --hostid "${def_hostid}" \
                                     --dhchap-secret "${hostkey}"
@@ -58,7 +58,7 @@ test() {
                fi
                _set_nvmet_hostkey "${def_hostnqn}" "${hostkey}"
 
-               _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
+               _nvme_connect_subsys "${def_subsysnqn}" \
                                     --hostnqn "${def_hostnqn}" \
                                     --hostid "${def_hostid}" \
                                     --dhchap-secret "${hostkey}"

diff --git a/tests/nvme/043 b/tests/nvme/043
index e65abb09fe7cd026037c43a4c225441ac7b54f7e..ed18869a5977f21e5ea170a322c669897344ab34 100755 (executable)
--- a/tests/nvme/043
+++ b/tests/nvme/043
@@ -45,7 +45,7 @@ test() {
 
                _set_nvmet_hash "${def_hostnqn}" "${hash}"
 
-               _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
+               _nvme_connect_subsys "${def_subsysnqn}" \
                                     --hostnqn "${def_hostnqn}" \
                                     --hostid "${def_hostid}" \
                                     --dhchap-secret "${hostkey}"
@@ -59,7 +59,7 @@ test() {
 
                _set_nvmet_dhgroup "${def_hostnqn}" "${dhgroup}"
 
-               _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
+               _nvme_connect_subsys "${def_subsysnqn}" \
                                      --hostnqn "${def_hostnqn}" \
                                      --hostid "${def_hostid}" \
                                      --dhchap-secret "${hostkey}"

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

diff --git a/tests/nvme/045 b/tests/nvme/045
index 9e5cb54e9533bd1e42c3b0a1c8b760bc8ab06121..f89378836e67553ae37f8d95caea7b620ffe69cf 100755 (executable)
--- a/tests/nvme/045
+++ b/tests/nvme/045
@@ -51,7 +51,7 @@ test() {
 
        _set_nvmet_dhgroup "${def_hostnqn}" "ffdhe2048"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
+       _nvme_connect_subsys "${def_subsysnqn}" \
                             --hostnqn "${def_hostnqn}" \
                             --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}" \

diff --git a/tests/nvme/047 b/tests/nvme/047
index 94d7d50f9f988d0379b8ceb0616ae754243c62f1..162bd3bf70fa9cfb74645cdbcbbf98a2bb2664b8 100755 (executable)
--- a/tests/nvme/047
+++ b/tests/nvme/047
@@ -27,7 +27,7 @@ test() {
 
        _nvmet_target_setup
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
+       _nvme_connect_subsys \
                --nr-write-queues 1 || echo FAIL
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
@@ -37,7 +37,7 @@ test() {
 
        _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
 
-       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
+       _nvme_connect_subsys "${def_subsysnqn}" \
                --nr-write-queues 1 \
                --nr-poll-queues 1 || echo FAIL
 

diff --git a/tests/nvme/048 b/tests/nvme/048
index f76cfedf8b03a6f8e50b056dc067b86aa3bb76c6..44fdffe287c8704e078a86d6decfa2900b14ccea 100755 (executable)
--- a/tests/nvme/048
+++ b/tests/nvme/048
@@ -99,7 +99,7 @@ test() {
        _nvmet_target_setup --blkdev file
 
        if [[ -f "${cfs_path}/attr_qid_max" ]] ; then
-               _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
+               _nvme_connect_subsys "${def_subsysnqn}" \
                                        --hostnqn "${def_hostnqn}" \
                                        --hostid "${def_hostid}" \
                                        --keep-alive-tmo 1 \

diff --git a/tests/nvme/rc b/tests/nvme/rc
index 9d47c737f9b060f61ac4823df4695f5fcf630306..9ce2fd787f8d63e7bb85f811f8e1e9473cacd70c 100644 (file)
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -408,7 +408,6 @@ _nvme_disconnect_subsys() {
 
 _nvme_connect_subsys() {
        local positional_args=()
-       local trtype=""
        local subsysnqn=""
        local hostnqn="$def_hostnqn"
        local hostid="$def_hostid"
@@ -478,13 +477,12 @@ _nvme_connect_subsys() {
 
        set -- "${positional_args[@]}"
 
-       trtype="$1"
-       subsysnqn="$2"
+       subsysnqn="$1"
 
-       ARGS=(--transport "${trtype}" --nqn "${subsysnqn}")
-       if [[ "${trtype}" == "fc" ]] ; then
+       ARGS=(--transport "${nvme_trtype}" --nqn "${subsysnqn}")
+       if [[ "${nvme_trtype}" == "fc" ]] ; then
                ARGS+=(--traddr "${def_traddr}" --host-traddr "${def_host_traddr}")
-       elif [[ "${trtype}" != "loop" ]]; then
+       elif [[ "${nvme_trtype}" != "loop" ]]; then
                ARGS+=(--traddr "${def_traddr}" --trsvcid "${def_trsvcid}")
        fi
        ARGS+=(--hostnqn="${hostnqn}")
@@ -902,7 +900,7 @@ _nvmet_passthru_target_connect() {
        local trtype=$1
        local subsys_name=$2
 
-       _nvme_connect_subsys "${trtype}" "${subsys_name}" --no-wait || return
+       _nvme_connect_subsys "${subsys_name}" --no-wait || return
        nsdev=$(_find_nvme_passthru_loop_dev "${subsys_name}")
 
        # The following tests can race with the creation