nvme/{041,042,043,044,045,048}: do not pass default host{nqn|id} to _nvme_connect_subsys

There is no point in passing the default values to
_nvme_connect_subsys, thus drop these arguments.

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

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

diff --git a/tests/nvme/042 b/tests/nvme/042
index 480e1cba9d19b2b98730a778c8266c3fa905ddd1..a9e79c6a13b4a22c45272b012d93e408dceead48 100755 (executable)
--- a/tests/nvme/042
+++ b/tests/nvme/042
@@ -41,9 +41,7 @@ test() {
                fi
                _set_nvmet_hostkey "${def_hostnqn}" "${hostkey}"
 
-               _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
-                                    --hostid "${def_hostid}" \
-                                    --dhchap-secret "${hostkey}"
+               _nvme_connect_subsys --dhchap-secret "${hostkey}"
 
                _nvme_disconnect_subsys
        done
@@ -57,9 +55,7 @@ test() {
                fi
                _set_nvmet_hostkey "${def_hostnqn}" "${hostkey}"
 
-               _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
-                                    --hostid "${def_hostid}" \
-                                    --dhchap-secret "${hostkey}"
+               _nvme_connect_subsys --dhchap-secret "${hostkey}"
 
                _nvme_disconnect_subsys
        done

diff --git a/tests/nvme/043 b/tests/nvme/043
index dd48035dd967a4ca7c4ff9d8868a0e038232f74a..4589423d4335126d4259de7e37a225ff4ae7c413 100755 (executable)
--- a/tests/nvme/043
+++ b/tests/nvme/043
@@ -45,9 +45,7 @@ test() {
 
                _set_nvmet_hash "${def_hostnqn}" "${hash}"
 
-               _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
-                                    --hostid "${def_hostid}" \
-                                    --dhchap-secret "${hostkey}"
+               _nvme_connect_subsys --dhchap-secret "${hostkey}"
 
                _nvme_disconnect_subsys
        done
@@ -58,9 +56,7 @@ test() {
 
                _set_nvmet_dhgroup "${def_hostnqn}" "${dhgroup}"
 
-               _nvme_connect_subsys  --hostnqn "${def_hostnqn}" \
-                                     --hostid "${def_hostid}" \
-                                     --dhchap-secret "${hostkey}"
+               _nvme_connect_subsys --dhchap-secret "${hostkey}"
 
                _nvme_disconnect_subsys
        done

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

diff --git a/tests/nvme/045 b/tests/nvme/045
index 3a5df7c0946c65cfa1b70ddbf42ddb7f070559fb..87ac3c01997008a13a14491b4ef4e58b6655ca20 100755 (executable)
--- a/tests/nvme/045
+++ b/tests/nvme/045
@@ -51,9 +51,7 @@ test() {
 
        _set_nvmet_dhgroup "${def_hostnqn}" "ffdhe2048"
 
-       _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
-                            --hostid "${def_hostid}" \
-                            --dhchap-secret "${hostkey}" \
+       _nvme_connect_subsys --dhchap-secret "${hostkey}" \
                             --dhchap-ctrl-secret "${ctrlkey}"
 
        echo "Re-authenticate with original host key"

diff --git a/tests/nvme/048 b/tests/nvme/048
index 79620e0d08797c06ded40b7a4a2c1a02db621519..0b299a91288bf3a42f57548b55d6477a2284d5ca 100755 (executable)
--- a/tests/nvme/048
+++ b/tests/nvme/048
@@ -99,9 +99,7 @@ test() {
        _nvmet_target_setup --blkdev file
 
        if [[ -f "${cfs_path}/attr_qid_max" ]] ; then
-               _nvme_connect_subsys --hostnqn "${def_hostnqn}" \
-                                    --hostid "${def_hostid}" \
-                                    --keep-alive-tmo 1 \
+               _nvme_connect_subsys --keep-alive-tmo 1 \
                                     --reconnect-delay 2
 
                if ! nvmf_wait_for_state "${def_subsysnqn}" "live" ; then