nvme/{041,042,043,044,045,048}: Remove local variable hostnqn and hostid

Commit acc408477e85 ("nvme/{041,042,043,044,045,048}: Use default
hostnqn and hostid") switched the test over to use the default
hostnqn. It missed the change to remove the local variable and
use the def_hostnqn/def_hostid directly.

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

diff --git a/tests/nvme/041 b/tests/nvme/041
index fbceaa1cb2d5b3f876d49396f88067a0f7ca0c41..4c553251f37961148dca627abc385c27a56a355b 100755 (executable)
--- a/tests/nvme/041
+++ b/tests/nvme/041
@@ -25,14 +25,10 @@ test() {
        _setup_nvmet
 
        local port
-       local hostid
-       local hostnqn
        local file_path="${TMPDIR}/img"
        local hostkey
        local ctrldev
 
-       hostid="${def_hostid}"
-       hostnqn="${def_hostnqn}"
        hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
        if [ -z "$hostkey" ] ; then
                echo "nvme gen-dhchap-key failed"
@@ -45,21 +41,21 @@ test() {
                "b92842df-a394-44b1-84a4-92ae7d112861"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
-       _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" "${hostkey}"
+       _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}"
 
        # Test unauthenticated connection (should fail)
        echo "Test unauthenticated connection (should fail)"
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
-                            --hostnqn "${hostnqn}" \
-                            --hostid "${hostid}"
+                            --hostnqn "${def_hostnqn}" \
+                            --hostid "${def_hostid}"
 
        _nvme_disconnect_subsys "${def_subsysnqn}"
 
        # Test authenticated connection
        echo "Test authenticated connection"
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
-                            --hostnqn "${hostnqn}" \
-                            --hostid "${hostid}" \
+                            --hostnqn "${def_hostnqn}" \
+                            --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}"
 
        udevadm settle
@@ -71,7 +67,7 @@ test() {
 
        _remove_nvmet_port "${port}"
 
-       _remove_nvmet_host "${hostnqn}"
+       _remove_nvmet_host "${def_hostnqn}"
 
        rm "${file_path}"
 

diff --git a/tests/nvme/042 b/tests/nvme/042
index 28d712e835df092dc260758b8b3e4ae508c57e3d..866249ed598c69d2be2e021ce0b6c9ccb4773c75 100755 (executable)
--- a/tests/nvme/042
+++ b/tests/nvme/042
@@ -25,23 +25,18 @@ test() {
        _setup_nvmet
 
        local port
-       local hostid
-       local hostnqn
        local file_path="${TMPDIR}/img"
        local hmac
        local key_len
        local hostkey
        local ctrldev
 
-       hostid="${def_hostid}"
-       hostnqn="${def_hostnqn}"
-
        truncate -s "${nvme_img_size}" "${file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
-       _create_nvmet_host "${def_subsysnqn}" "${hostnqn}"
+       _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
 
        for hmac in 0 1 2 3; do
                echo "Testing hmac ${hmac}"
@@ -50,11 +45,11 @@ test() {
                        echo "couldn't generate host key for hmac ${hmac}"
                        return 1
                fi
-               _set_nvmet_hostkey "${hostnqn}" "${hostkey}"
+               _set_nvmet_hostkey "${def_hostnqn}" "${hostkey}"
 
                _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
-                                    --hostnqn "${hostnqn}" \
-                                    --hostid "${hostid}" \
+                                    --hostnqn "${def_hostnqn}" \
+                                    --hostid "${def_hostid}" \
                                     --dhchap-secret "${hostkey}"
                udevadm settle
 
@@ -68,11 +63,11 @@ test() {
                        echo "couldn't generate host key for length ${key_len}"
                        return 1
                fi
-               _set_nvmet_hostkey "${hostnqn}" "${hostkey}"
+               _set_nvmet_hostkey "${def_hostnqn}" "${hostkey}"
 
                _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
-                                    --hostnqn "${hostnqn}" \
-                                    --hostid "${hostid}" \
+                                    --hostnqn "${def_hostnqn}" \
+                                    --hostid "${def_hostid}" \
                                     --dhchap-secret "${hostkey}"
 
                udevadm settle
@@ -85,7 +80,7 @@ test() {
 
        _remove_nvmet_port "${port}"
 
-       _remove_nvmet_host "${hostnqn}"
+       _remove_nvmet_host "${def_hostnqn}"
 
        rm "${file_path}"
 

diff --git a/tests/nvme/043 b/tests/nvme/043
index 184b1254a3835309c9ea41ba650aaad491c2b329..5569a7a58ad5d2832d30ad99721e6829fd261be2 100755 (executable)
--- a/tests/nvme/043
+++ b/tests/nvme/043
@@ -26,18 +26,13 @@ test() {
        _setup_nvmet
 
        local port
-       local subsys_name="blktests-subsystem-1"
-       local hostid
-       local hostnqn
        local file_path="${TMPDIR}/img"
        local hash
        local dhgroup
        local hostkey
        local ctrldev
 
-       hostid="${def_hostid}"
-       hostnqn="${def_hostnqn}"
-       hostkey="$(nvme gen-dhchap-key -n ${hostnqn} 2> /dev/null)"
+       hostkey="$(nvme gen-dhchap-key -n ${def_hostnqn} 2> /dev/null)"
        if [ -z "$hostkey" ] ; then
                echo "nvme gen-dhchap-key failed"
                return 1
@@ -48,17 +43,17 @@ test() {
        _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
-       _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" "${hostkey}"
+       _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}"
 
        for hash in "hmac(sha256)" "hmac(sha384)" "hmac(sha512)" ; do
 
                echo "Testing hash ${hash}"
 
-               _set_nvmet_hash "${hostnqn}" "${hash}"
+               _set_nvmet_hash "${def_hostnqn}" "${hash}"
 
                _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
-                                    --hostnqn "${hostnqn}" \
-                                    --hostid "${hostid}" \
+                                    --hostnqn "${def_hostnqn}" \
+                                    --hostid "${def_hostid}" \
                                     --dhchap-secret "${hostkey}"
 
                udevadm settle
@@ -70,11 +65,11 @@ test() {
 
                echo "Testing DH group ${dhgroup}"
 
-               _set_nvmet_dhgroup "${hostnqn}" "${dhgroup}"
+               _set_nvmet_dhgroup "${def_hostnqn}" "${dhgroup}"
 
                _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
-                                     --hostnqn "${hostnqn}" \
-                                     --hostid "${hostid}" \
+                                     --hostnqn "${def_hostnqn}" \
+                                     --hostid "${def_hostid}" \
                                      --dhchap-secret "${hostkey}"
 
                udevadm settle
@@ -87,7 +82,7 @@ test() {
 
        _remove_nvmet_port "${port}"
 
-       _remove_nvmet_host "${hostnqn}"
+       _remove_nvmet_host "${def_hostnqn}"
 
        rm "${file_path}"
 

diff --git a/tests/nvme/044 b/tests/nvme/044
index 608a086a08643f2db76891c6a6d97c41c5badb3d..6c2cb602313cb3e50e6425c765d8650dc78ba68d 100755 (executable)
--- a/tests/nvme/044
+++ b/tests/nvme/044
@@ -26,16 +26,11 @@ test() {
        _setup_nvmet
 
        local port
-       local hostid
-       local hostnqn
        local file_path="${TMPDIR}/img"
        local hostkey
        local ctrlkey
        local ctrldev
 
-       hostid="${def_hostid}"
-       hostnqn="${def_hostnqn}"
-
        hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
        if [ -z "$hostkey" ] ; then
                echo "failed to generate host key"
@@ -53,16 +48,16 @@ test() {
        _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
-       _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" \
+       _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" \
                           "${hostkey}" "${ctrlkey}"
 
-       _set_nvmet_dhgroup "${hostnqn}" "ffdhe2048"
+       _set_nvmet_dhgroup "${def_hostnqn}" "ffdhe2048"
 
        # Step 1: Connect with host authentication only
        echo "Test host authentication"
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
-                            --hostnqn "${hostnqn}" \
-                            --hostid "${hostid}" \
+                            --hostnqn "${def_hostnqn}" \
+                            --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}"
 
        udevadm settle
@@ -73,8 +68,8 @@ test() {
        # and invalid ctrl authentication
        echo "Test invalid ctrl authentication (should fail)"
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
-                            --hostnqn "${hostnqn}" \
-                            --hostid "${hostid}" \
+                            --hostnqn "${def_hostnqn}" \
+                            --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}" \
                             --dhchap-ctrl-secret "${hostkey}"
 
@@ -86,8 +81,8 @@ test() {
        # and valid ctrl authentication
        echo "Test valid ctrl authentication"
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
-                            --hostnqn "${hostnqn}" \
-                            --hostid "${hostid}" \
+                            --hostnqn "${def_hostnqn}" \
+                            --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}" \
                             --dhchap-ctrl-secret "${ctrlkey}"
 
@@ -100,8 +95,8 @@ test() {
        echo "Test invalid ctrl key (should fail)"
        invkey="DHHC-1:00:Jc/My1o0qtLCWRp+sHhAVafdfaS7YQOMYhk9zSmlatobqB8C:"
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
-                            --hostnqn "${hostnqn}" \
-                            --hostid "${hostid}" \
+                            --hostnqn "${def_hostnqn}" \
+                            --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}" \
                             --dhchap-ctrl-secret "${invkey}"
 
@@ -114,7 +109,7 @@ test() {
 
        _remove_nvmet_port "${port}"
 
-       _remove_nvmet_host "${hostnqn}"
+       _remove_nvmet_host "${def_hostnqn}"
 
        rm "${file_path}"
 

diff --git a/tests/nvme/045 b/tests/nvme/045
index b8d886aaf9e8f68353958bfd89a5d44539f8816a..a936e7fb661f5c61cc3342065d58d95605fed023 100755 (executable)
--- a/tests/nvme/045
+++ b/tests/nvme/045
@@ -27,8 +27,6 @@ test() {
        _setup_nvmet
 
        local port
-       local hostid
-       local hostnqn
        local file_path="${TMPDIR}/img"
        local hostkey
        local new_hostkey
@@ -37,9 +35,6 @@ test() {
        local ctrldev
        local rand_io_size
 
-       hostid="${def_hostid}"
-       hostnqn="${def_hostnqn}"
-
        hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
        if [ -z "$hostkey" ] ; then
                echo "failed to generate host key"
@@ -57,13 +52,13 @@ test() {
        _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
-       _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" "${hostkey}" "${ctrlkey}"
+       _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}" "${ctrlkey}"
 
-       _set_nvmet_dhgroup "${hostnqn}" "ffdhe2048"
+       _set_nvmet_dhgroup "${def_hostnqn}" "ffdhe2048"
 
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
-                            --hostnqn "${hostnqn}" \
-                            --hostid "${hostid}" \
+                            --hostnqn "${def_hostnqn}" \
+                            --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}" \
                             --dhchap-ctrl-secret "${ctrlkey}"
 
@@ -82,7 +77,7 @@ test() {
 
        new_hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
 
-       _set_nvmet_hostkey "${hostnqn}" "${new_hostkey}"
+       _set_nvmet_hostkey "${def_hostnqn}" "${new_hostkey}"
 
        echo "Re-authenticate with new host key"
 
@@ -92,7 +87,7 @@ test() {
 
        new_ctrlkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
 
-       _set_nvmet_ctrlkey "${hostnqn}" "${new_ctrlkey}"
+       _set_nvmet_ctrlkey "${def_hostnqn}" "${new_ctrlkey}"
 
        echo "Re-authenticate with new ctrl key"
 
@@ -101,7 +96,7 @@ test() {
 
        echo "Change DH group to ffdhe8192"
 
-       _set_nvmet_dhgroup "${hostnqn}" "ffdhe8192"
+       _set_nvmet_dhgroup "${def_hostnqn}" "ffdhe8192"
 
        echo "Re-authenticate with changed DH group"
 
@@ -109,7 +104,7 @@ test() {
 
        echo "Change hash to hmac(sha512)"
 
-       _set_nvmet_hash "${hostnqn}" "hmac(sha512)"
+       _set_nvmet_hash "${def_hostnqn}" "hmac(sha512)"
 
        echo "Re-authenticate with changed hash"
 
@@ -127,7 +122,7 @@ test() {
 
        _remove_nvmet_port "${port}"
 
-       _remove_nvmet_host "${hostnqn}"
+       _remove_nvmet_host "${def_hostnqn}"
 
        rm "${file_path}"
 

diff --git a/tests/nvme/048 b/tests/nvme/048
index 20d234e7262156031604684d31486aeebe1b0ad3..f9a19b1e655efad3c4fe1287a264bfa3e1af94a8 100755 (executable)
--- a/tests/nvme/048
+++ b/tests/nvme/048
@@ -88,25 +88,21 @@ test() {
        local cfs_path="${NVMET_CFS}/subsystems/${def_subsysnqn}"
        local file_path="${TMPDIR}/img"
        local skipped=false
-       local hostnqn
-       local hostid
        local port
 
-       hostid="${def_hostid}"
-       hostnqn="${def_hostnqn}"
-
        truncate -s "${nvme_img_size}" "${file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "b92842df-a394-44b1-84a4-92ae7d112861"
        port="$(_create_nvmet_port "${nvme_trtype}")"
+
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
        _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
 
        if [[ -f "${cfs_path}/attr_qid_max" ]] ; then
                _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
-                                       --hostnqn "${hostnqn}" \
-                                       --hostid "${hostid}" \
+                                       --hostnqn "${def_hostnqn}" \
+                                       --hostid "${def_hostid}" \
                                        --keep-alive-tmo 1 \
                                        --reconnect-delay 2
 
@@ -126,7 +122,7 @@ test() {
        _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
-       _remove_nvmet_host "${hostnqn}"
+       _remove_nvmet_host "${def_hostnqn}"
 
        rm "${file_path}"