nvme: Use def_subsysnqn variable instead local variable

As all tests are using the same subsystem nqn anyway, use
the def_subsysnqn variable and drop the local subsys_name
variable.

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/003 b/tests/nvme/003
index aa26abf8d8b3ebff5e7ddbc8bcd38586b05d559b..71b82ce758a3524ab7004472d4d4c5fcd649d241 100755 (executable)
--- a/tests/nvme/003
+++ b/tests/nvme/003
@@ -29,8 +29,8 @@ test() {
 
        loop_dev="$(losetup -f)"
 
-       _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}"
-       _add_nvmet_subsys_to_port "${port}" "blktests-subsystem-1"
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
        _nvme_connect_subsys "${nvme_trtype}" nqn.2014-08.org.nvmexpress.discovery
 
@@ -46,8 +46,8 @@ test() {
        fi
 
        _nvme_disconnect_subsys nqn.2014-08.org.nvmexpress.discovery
-       _remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1"
-       _remove_nvmet_subsystem "blktests-subsystem-1"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        echo "Test complete"

diff --git a/tests/nvme/004 b/tests/nvme/004
index 1e5c2b8b3e87d406626676f80318385a98eb6135..0314ed3c949e361cceddd3caba1592800160ce0e 100755 (executable)
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -31,20 +31,20 @@ test() {
 
        loop_dev="$(losetup -f --show "$TMPDIR/img")"
 
-       _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       _add_nvmet_subsys_to_port "${port}" "blktests-subsystem-1"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        local nvmedev
-       nvmedev=$(_find_nvme_dev "blktests-subsystem-1")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
-       _nvme_disconnect_subsys blktests-subsystem-1
-       _remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1"
-       _remove_nvmet_subsystem "blktests-subsystem-1"
+       _nvme_disconnect_subsys ${def_subsysnqn}
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
        losetup -d "$loop_dev"
        rm "$TMPDIR/img"

diff --git a/tests/nvme/005 b/tests/nvme/005
index 8368540868220a099523ecc11bf6822d5494f388..935b8634cb96a0228b9d4cf46fb87ccdc53618c0 100755 (executable)
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -31,23 +31,23 @@ test() {
 
        loop_dev="$(losetup -f --show "$TMPDIR/img")"
 
-       _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       _add_nvmet_subsys_to_port "${port}" "blktests-subsystem-1"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "blktests-subsystem-1")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 
        udevadm settle
 
        echo 1 > "/sys/class/nvme/${nvmedev}/reset_controller"
 
        _nvme_disconnect_ctrl "${nvmedev}"
-       _remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       _remove_nvmet_subsystem "blktests-subsystem-1"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        losetup -d "$loop_dev"
        rm "$TMPDIR/img"
 

diff --git a/tests/nvme/006 b/tests/nvme/006
index b44c56b6a25d891e19a85e48872d6fa2cee24695..066acabb11750d49ebc94acfbf0287dbfcaaed38 100755 (executable)
--- a/tests/nvme/006
+++ b/tests/nvme/006
@@ -22,19 +22,18 @@ test() {
 
        local port
        local loop_dev
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "$TMPDIR/img"
 
        loop_dev="$(losetup -f --show "$TMPDIR/img")"
 
-       _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        losetup -d "$loop_dev"

diff --git a/tests/nvme/007 b/tests/nvme/007
index 112432df7a9d7edc798439117128d6c9a6dcdbcf..c6ba36cc4b4f5d3f72846f66eb15b6a3dfdb7a59 100755 (executable)
--- a/tests/nvme/007
+++ b/tests/nvme/007
@@ -21,19 +21,18 @@ test() {
 
        local port
        local file_path
-       local subsys_name="blktests-subsystem-1"
 
        file_path="${TMPDIR}/img"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm "${file_path}"

diff --git a/tests/nvme/008 b/tests/nvme/008
index 5abc4240ca46d83d91b266ce320a453b0f15b658..c3fbcbc596867c46f8c83d109751d4bae6c2ecdf 100755 (executable)
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -24,29 +24,28 @@ test() {
        local nvmedev
        local loop_dev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
        loop_dev="$(losetup -f --show "${file_path}")"
 
-       _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
        udevadm settle
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        losetup -d "${loop_dev}"

diff --git a/tests/nvme/009 b/tests/nvme/009
index 491d3c809ab0564ba0a7d7a7e427e3fbb881df83..88c27889fbe17ee31fbfdb055dcef3b119035ea3 100755 (executable)
--- a/tests/nvme/009
+++ b/tests/nvme/009
@@ -22,27 +22,26 @@ test() {
        local port
        local nvmedev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
        udevadm settle
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm "${file_path}"

diff --git a/tests/nvme/010 b/tests/nvme/010
index d2eb95311510d2cbb361e252ce58740750f5aa24..38c062ec73f4104aeb390899f55497e41f1584df 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -24,30 +24,29 @@ test() {
        local nvmedev
        local loop_dev
        local file_path="${TMPDIR}/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
        loop_dev="$(losetup -f --show "${file_path}")"
 
-       _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
        _run_fio_verify_io --size="${nvme_img_size}" \
                --filename="/dev/${nvmedev}n1"
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        losetup -d "${loop_dev}"

diff --git a/tests/nvme/011 b/tests/nvme/011
index da8cbac11124c09b316a4a0a666f6f0933e55b36..0dab74e7e5b56ba1c56aa96a02c50ccd48c84f43 100755 (executable)
--- a/tests/nvme/011
+++ b/tests/nvme/011
@@ -24,28 +24,27 @@ test() {
        local nvmedev
        local file_path
        local file_path="${TMPDIR}/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
        _run_fio_verify_io --size="${nvme_img_size}" \
                --filename="/dev/${nvmedev}n1"
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm "${file_path}"

diff --git a/tests/nvme/012 b/tests/nvme/012
index efe227538c57978902e9864150535126b3afee72..8ed57d3a5ab0974a6b26b0fdda3b9bafdb8d8647 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -28,29 +28,28 @@ test() {
        local nvmedev
        local loop_dev
        local file_path="${TMPDIR}/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
        loop_dev="$(losetup -f --show "${file_path}")"
 
-       _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
        _xfs_run_fio_verify_io "/dev/${nvmedev}n1"
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        losetup -d "${loop_dev}"

diff --git a/tests/nvme/013 b/tests/nvme/013
index 2be8681616d156ddd65781801f32c0e090e9eeca..e3eb4e914750f429657efbed02fed8ce1aef4ffd 100755 (executable)
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -26,27 +26,26 @@ test() {
        local port
        local nvmedev
        local file_path="${TMPDIR}/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
        _xfs_run_fio_verify_io "/dev/${nvmedev}n1"
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm "${file_path}"

diff --git a/tests/nvme/014 b/tests/nvme/014
index 55d920f2660b9569ae4264044946cdb170be4faf..cbafd802af1648749110fe9ef2a3dbe4ef26ef42 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -27,20 +27,19 @@ test() {
        local bs
        local count
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
        loop_dev="$(losetup -f --show "${file_path}")"
 
-       _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                 "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
@@ -53,10 +52,10 @@ test() {
 
        nvme flush "/dev/${nvmedev}" -n 1
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        losetup -d "${loop_dev}"

diff --git a/tests/nvme/015 b/tests/nvme/015
index 071141380e43b8f9acad74c48861c9f34a958b8a..b32d16a91de8160dff3f517229da1fbf7967cb18 100755 (executable)
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -26,18 +26,17 @@ test() {
        local bs
        local count
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                 "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
@@ -50,10 +49,10 @@ test() {
 
        nvme flush "/dev/${nvmedev}n1" -n 1
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm "${file_path}"

diff --git a/tests/nvme/016 b/tests/nvme/016
index cac0c0509acab8f76c1757ff1489c2e7d376b8f4..908abbdaaa75f390760f10ab0e10e2034e06824f 100755 (executable)
--- a/tests/nvme/016
+++ b/tests/nvme/016
@@ -21,30 +21,29 @@ test() {
        local port
        local iterations="${nvme_num_iter}"
        local loop_dev
-       local subsys_nqn="blktests-subsystem-1"
 
        loop_dev="$(losetup -f)"
        local genctr=1
 
-       _create_nvmet_subsystem "${subsys_nqn}" "${loop_dev}"
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}"
 
        for ((i = 2; i <= iterations; i++)); do
-               _create_nvmet_ns "${subsys_nqn}" "${i}" "${loop_dev}"
+               _create_nvmet_ns "${def_subsysnqn}" "${i}" "${loop_dev}"
        done
 
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "$port" "${subsys_nqn}"
+       _add_nvmet_subsys_to_port "$port" "${def_subsysnqn}"
 
        genctr=$(_check_genctr "${genctr}" "adding a subsystem to a port")
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_nqn}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        for ((i = iterations; i > 1; i--)); do
-               _remove_nvmet_ns "${subsys_nqn}" "$i"
+               _remove_nvmet_ns "${def_subsysnqn}" "$i"
        done
 
-       _remove_nvmet_subsystem "${subsys_nqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/017 b/tests/nvme/017
index 429a25e8e01127fdec7a27a9c3757ce6e125ffa9..6f7ef5882d3e222c419372152feab52934b330c4 100755 (executable)
--- a/tests/nvme/017
+++ b/tests/nvme/017
@@ -21,7 +21,6 @@ test() {
        local port
        local file_path
        local iterations="${nvme_num_iter}"
-       local subsys_name="blktests-subsystem-1"
 
        file_path="${TMPDIR}/img"
 
@@ -29,26 +28,26 @@ test() {
 
        local genctr=1
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
 
        for ((i = 2; i <= iterations; i++)); do
-               _create_nvmet_ns "${subsys_name}" "${i}" "${file_path}"
+               _create_nvmet_ns "${def_subsysnqn}" "${i}" "${file_path}"
        done
 
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
        genctr=$(_check_genctr "${genctr}" "adding a subsystem to a port")
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        for ((i = iterations; i > 1; i--)); do
-               _remove_nvmet_ns "${subsys_name}" "$i"
+               _remove_nvmet_ns "${def_subsysnqn}" "$i"
        done
 
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
 
        rm "${file_path}"
 

diff --git a/tests/nvme/018 b/tests/nvme/018
index 78e9b2bb94d8b1f967454401395bd0103a6a8fb8..155f094ea6b3b80294564436ac9b2ea9a11c16b2 100755 (executable)
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -24,18 +24,17 @@ test() {
        local port
        local nvmedev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                 "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
@@ -47,10 +46,10 @@ test() {
        nvme read "/dev/${nvmedev}n1" -s "$sectors" -c 0 -z "$bs" &>"$FULL" \
                && echo "ERROR: nvme read for out of range LBA was not rejected"
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm "${file_path}"

diff --git a/tests/nvme/019 b/tests/nvme/019
index 9fff8ccaac9cf71d627ee02d74b0fc47ce4ce656..4ac351cbb782821ac1eba0a6a87d443721d464be 100755 (executable)
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -24,7 +24,6 @@ test() {
        local nvmedev
        local loop_dev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
        local nblk_range="10,10,10,10,10,10,10,10,10,10"
        local sblk_range="100,200,300,400,500,600,700,800,900,1000"
 
@@ -32,23 +31,23 @@ test() {
 
        loop_dev="$(losetup -f --show "${file_path}")"
 
-       _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
        nvme dsm "/dev/${nvmedev}" -n 1 -d -s "${sblk_range}" -b "${nblk_range}"
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        losetup -d "${loop_dev}"

diff --git a/tests/nvme/020 b/tests/nvme/020
index 1966d5925213f1ba89eedc49b5066a691fb27873..744d4b7d6805568fb68ee6a51ef66342dfdb4d73 100755 (executable)
--- a/tests/nvme/020
+++ b/tests/nvme/020
@@ -22,29 +22,28 @@ test() {
        local port
        local nvmedev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
        local nblk_range="10,10,10,10,10,10,10,10,10,10"
        local sblk_range="100,200,300,400,500,600,700,800,900,1000"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
        nvme dsm "/dev/${nvmedev}" -n 1 -d -s "${sblk_range}" -b "${nblk_range}"
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm -f "${file_path}"

diff --git a/tests/nvme/021 b/tests/nvme/021
index 1fefc0fbca004812b9b6dc283a3b80afa0653e89..1fd9bcbb3d23fb2b52d7bf5be666499eb56d5ecb 100755 (executable)
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -23,18 +23,17 @@ test() {
        local port
        local nvmedev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
@@ -42,10 +41,10 @@ test() {
                echo "ERROR: device not listed"
        fi
 
-       _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm -f "${file_path}"

diff --git a/tests/nvme/022 b/tests/nvme/022
index 1ff915786f8636a6c0b67abf0dfeaef1aa60877d..0539916252500e54804e43742b49b3df0df9d107 100755 (executable)
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -23,18 +23,17 @@ test() {
        local port
        local nvmedev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
@@ -42,10 +41,10 @@ test() {
                echo "ERROR: reset failed"
        fi
 
-       _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm -f "${file_path}"

diff --git a/tests/nvme/023 b/tests/nvme/023
index 90316230a3d7a4c7e99fd8d5666ce5397deaeeed..c10e5a0138a8ef52bbce9978c3ccbc19d115fda2 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -24,20 +24,19 @@ test() {
        local nvmedev
        local loop_dev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
        loop_dev="$(losetup -f --show "${file_path}")"
 
-       _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
@@ -45,10 +44,10 @@ test() {
                echo "ERROR: smart-log bdev-ns failed"
        fi
 
-       _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        losetup -d "${loop_dev}"

diff --git a/tests/nvme/024 b/tests/nvme/024
index 384a8266e7419c961195d52e50ce3f0b8b8de095..d1d7f0bfb99457e68d72dc9883bf379d6f38efa4 100755 (executable)
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -23,28 +23,27 @@ test() {
        local port
        local nvmedev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
        if ! nvme smart-log "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then
                echo "ERROR: smart-log file-ns failed"
        fi
-       _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm -f "${file_path}"

diff --git a/tests/nvme/025 b/tests/nvme/025
index 815223d1c28d29b1dc60b57e353658dec9550ac2..ea944830612bb9ae7a5aa98ac5ce5aeffc1ad9a4 100755 (executable)
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -23,18 +23,17 @@ test() {
        local port
        local nvmedev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
@@ -42,10 +41,10 @@ test() {
                echo "ERROR: effects-log failed"
        fi
 
-       _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm -f "${file_path}"

diff --git a/tests/nvme/026 b/tests/nvme/026
index d2203f19f0265d1208f95309e0701363a05900ca..f1193c20477c876ce86c43b1d33411a1cb4c5f70 100755 (executable)
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -23,18 +23,17 @@ test() {
        local port
        local nvmedev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
@@ -42,10 +41,10 @@ test() {
                echo "ERROR: ns-desc failed"
        fi
 
-       _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm -f "${file_path}"

diff --git a/tests/nvme/027 b/tests/nvme/027
index 97fe70e78344539c8b7bc4cacbe49b9f450a58ad..c097c51ea4f3a5e2e9ebc398fb11fdf0c3ec6f66 100755 (executable)
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -23,28 +23,27 @@ test() {
        local port
        local nvmedev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
        if ! nvme ns-rescan "/dev/${nvmedev}" >> "$FULL" 2>&1; then
                echo "ERROR: ns-rescan failed"
        fi
-       _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm -f "${file_path}"

diff --git a/tests/nvme/028 b/tests/nvme/028
index c539620bee28313e1c4a46cc9f6da851dc2ea629..6e37be4893b1a8e83a81df60ddf9c44dcda0fc59 100755 (executable)
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -23,28 +23,27 @@ test() {
        local port
        local nvmedev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
        if ! nvme list-subsys 2>> "$FULL" | grep -q "${nvme_trtype}"; then
                echo "ERROR: list-subsys"
        fi
-       _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        rm -f "${file_path}"

diff --git a/tests/nvme/029 b/tests/nvme/029
index c6d38b42af70f7acf489b03bc0e3f29402851263..4d0ca997404bf034a76985da22b1117c82cf8433 100755 (executable)
--- a/tests/nvme/029
+++ b/tests/nvme/029
@@ -57,20 +57,19 @@ test() {
        local nvmedev
        local loop_dev
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
        loop_dev="$(losetup -f --show "${file_path}")"
 
-       _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                 "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
@@ -82,10 +81,10 @@ test() {
        test_user_io "$dev" 511 1023 > "$FULL" 2>&1 || echo FAIL
        test_user_io "$dev" 511 1025 > "$FULL" 2>&1 || echo FAIL
 
-       _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        losetup -d "${loop_dev}"

diff --git a/tests/nvme/033 b/tests/nvme/033
index 5a4fac03bea0ed6f350f1495b80736970be31e27..46a520ae01fabbf35ebe91599df97c1e6ede2e1c 100755 (executable)
--- a/tests/nvme/033
+++ b/tests/nvme/033
@@ -49,7 +49,7 @@ test_device() {
 
        _setup_nvmet
 
-       local subsys="blktests-subsystem-1"
+       local subsys="${def_subsysnqn}"
        local nsdev
        local port
 

diff --git a/tests/nvme/034 b/tests/nvme/034
index 334b2525d1b6d5618d4c752d6d408b34e4e7447c..3c65d92cbaeaf63fcffcc8ed2c0c4b9c5ebe040b 100755 (executable)
--- a/tests/nvme/034
+++ b/tests/nvme/034
@@ -19,7 +19,7 @@ test_device() {
 
        _setup_nvmet
 
-       local subsys="blktests-subsystem-1"
+       local subsys="${def_subsysnqn}"
        local ctrldev
        local nsdev
        local port

diff --git a/tests/nvme/035 b/tests/nvme/035
index 68a9b608920e11aeb3b8cf6378220b548c5e73a5..c705d9cf25a4e609c5a3546551773666832b993e 100755 (executable)
--- a/tests/nvme/035
+++ b/tests/nvme/035
@@ -25,7 +25,7 @@ test_device() {
 
        _setup_nvmet
 
-       local subsys="blktests-subsystem-1"
+       local subsys="${def_subsysnqn}"
        local ctrldev
        local nsdev
        local port

diff --git a/tests/nvme/036 b/tests/nvme/036
index c3fc5d4a948ddc50aae2b5c7e690eccbdeb956ce..2e933cc41928f78281f67bd188659f988e7b1521 100755 (executable)
--- a/tests/nvme/036
+++ b/tests/nvme/036
@@ -18,7 +18,7 @@ test_device() {
 
        _setup_nvmet
 
-       local subsys="blktests-subsystem-1"
+       local subsys="${def_subsysnqn}"
        local ctrldev
        local port
 

diff --git a/tests/nvme/038 b/tests/nvme/038
index 5af28da03c3666823f666f77153345b01c5e7e94..007b5f42531207bd512c340bb74ccc2da504d8ae 100755 (executable)
--- a/tests/nvme/038
+++ b/tests/nvme/038
@@ -23,7 +23,7 @@ test() {
 
        _setup_nvmet
 
-       local subsys_path="${NVMET_CFS}/subsystems/blktests-subsystem-1"
+       local subsys_path="${NVMET_CFS}/subsystems/${def_subsysnqn}"
        local port
 
        mkdir -p "${subsys_path}"

diff --git a/tests/nvme/040 b/tests/nvme/040
index 3b76753132f37c23f97a17049206e072c6d251f5..8d7f68f9a2d7c050e1af8f396cb3d3fd50484910 100755 (executable)
--- a/tests/nvme/040
+++ b/tests/nvme/040
@@ -21,7 +21,6 @@ test() {
 
        _setup_nvmet
 
-       local subsys="blktests-subsystem-1"
        local file_path="${TMPDIR}/img"
        local port
        local loop_dev
@@ -32,11 +31,11 @@ test() {
        loop_dev="$(losetup -f --show "${file_path}")"
 
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _create_nvmet_subsystem "${subsys}" "${loop_dev}"
-       _add_nvmet_subsys_to_port "${port}" "${subsys}"
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys}"
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
        udevadm settle
-       nvmedev=$(_find_nvme_dev "${subsys}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 
        # start fio job
        echo "starting background fio"
@@ -55,8 +54,8 @@ test() {
 
        { kill "${fio_pid}"; wait; } &> /dev/null
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys}"
-       _remove_nvmet_subsystem "${subsys}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        losetup -d "${loop_dev}"

diff --git a/tests/nvme/041 b/tests/nvme/041
index d8937915d622cc0d56114c53df88d0d3fff18156..fbceaa1cb2d5b3f876d49396f88067a0f7ca0c41 100755 (executable)
--- a/tests/nvme/041
+++ b/tests/nvme/041
@@ -25,7 +25,6 @@ test() {
        _setup_nvmet
 
        local port
-       local subsys_name="blktests-subsystem-1"
        local hostid
        local hostnqn
        local file_path="${TMPDIR}/img"
@@ -34,7 +33,7 @@ test() {
 
        hostid="${def_hostid}"
        hostnqn="${def_hostnqn}"
-       hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)"
+       hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
        if [ -z "$hostkey" ] ; then
                echo "nvme gen-dhchap-key failed"
                return 1
@@ -42,33 +41,33 @@ test() {
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${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}" "${subsys_name}"
-       _create_nvmet_host "${subsys_name}" "${hostnqn}" "${hostkey}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
+       _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" "${hostkey}"
 
        # Test unauthenticated connection (should fail)
        echo "Test unauthenticated connection (should fail)"
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                             --hostnqn "${hostnqn}" \
                             --hostid "${hostid}"
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
        # Test authenticated connection
        echo "Test authenticated connection"
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                             --hostnqn "${hostnqn}" \
                             --hostid "${hostid}" \
                             --dhchap-secret "${hostkey}"
 
        udevadm settle
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
 
        _remove_nvmet_port "${port}"
 

diff --git a/tests/nvme/042 b/tests/nvme/042
index af291cb33a0443dd24c7a0c8ec9725a1ed799230..28d712e835df092dc260758b8b3e4ae508c57e3d 100755 (executable)
--- a/tests/nvme/042
+++ b/tests/nvme/042
@@ -25,7 +25,6 @@ test() {
        _setup_nvmet
 
        local port
-       local subsys_name="blktests-subsystem-1"
        local hostid
        local hostnqn
        local file_path="${TMPDIR}/img"
@@ -39,50 +38,50 @@ test() {
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}"
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
-       _create_nvmet_host "${subsys_name}" "${hostnqn}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
+       _create_nvmet_host "${def_subsysnqn}" "${hostnqn}"
 
        for hmac in 0 1 2 3; do
                echo "Testing hmac ${hmac}"
-               hostkey="$(nvme gen-dhchap-key --hmac=${hmac} -n ${subsys_name} 2> /dev/null)"
+               hostkey="$(nvme gen-dhchap-key --hmac=${hmac} -n ${def_subsysnqn} 2> /dev/null)"
                if [ -z "$hostkey" ] ; then
                        echo "couldn't generate host key for hmac ${hmac}"
                        return 1
                fi
                _set_nvmet_hostkey "${hostnqn}" "${hostkey}"
 
-               _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \
+               _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                                     --hostnqn "${hostnqn}" \
                                     --hostid "${hostid}" \
                                     --dhchap-secret "${hostkey}"
                udevadm settle
 
-               _nvme_disconnect_subsys "${subsys_name}"
+               _nvme_disconnect_subsys "${def_subsysnqn}"
        done
 
        for key_len in 32 48 64; do
                echo "Testing key length ${key_len}"
-               hostkey="$(nvme gen-dhchap-key --key-length=${key_len} -n ${subsys_name} 2> /dev/null)"
+               hostkey="$(nvme gen-dhchap-key --key-length=${key_len} -n ${def_subsysnqn} 2> /dev/null)"
                if [ -z "$hostkey" ] ; then
                        echo "couldn't generate host key for length ${key_len}"
                        return 1
                fi
                _set_nvmet_hostkey "${hostnqn}" "${hostkey}"
 
-               _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \
+               _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                                     --hostnqn "${hostnqn}" \
                                     --hostid "${hostid}" \
                                     --dhchap-secret "${hostkey}"
 
                udevadm settle
 
-               _nvme_disconnect_subsys "${subsys_name}"
+               _nvme_disconnect_subsys "${def_subsysnqn}"
        done
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
 
        _remove_nvmet_port "${port}"
 

diff --git a/tests/nvme/043 b/tests/nvme/043
index b5cb8378681e985454a578b7887671c2e01ae9ff..184b1254a3835309c9ea41ba650aaad491c2b329 100755 (executable)
--- a/tests/nvme/043
+++ b/tests/nvme/043
@@ -45,10 +45,10 @@ test() {
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}"
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
-       _create_nvmet_host "${subsys_name}" "${hostnqn}" "${hostkey}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
+       _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" "${hostkey}"
 
        for hash in "hmac(sha256)" "hmac(sha384)" "hmac(sha512)" ; do
 
@@ -56,14 +56,14 @@ test() {
 
                _set_nvmet_hash "${hostnqn}" "${hash}"
 
-               _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \
+               _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                                     --hostnqn "${hostnqn}" \
                                     --hostid "${hostid}" \
                                     --dhchap-secret "${hostkey}"
 
                udevadm settle
 
-               _nvme_disconnect_subsys "${subsys_name}"
+               _nvme_disconnect_subsys "${def_subsysnqn}"
        done
 
        for dhgroup in "ffdhe2048" "ffdhe3072" "ffdhe4096" "ffdhe6144" "ffdhe8192" ; do
@@ -72,18 +72,18 @@ test() {
 
                _set_nvmet_dhgroup "${hostnqn}" "${dhgroup}"
 
-               _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \
+               _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                                      --hostnqn "${hostnqn}" \
                                      --hostid "${hostid}" \
                                      --dhchap-secret "${hostkey}"
 
                udevadm settle
 
-               _nvme_disconnect_subsys "${subsys_name}"
+               _nvme_disconnect_subsys "${def_subsysnqn}"
        done
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
 
        _remove_nvmet_port "${port}"
 

diff --git a/tests/nvme/044 b/tests/nvme/044
index 27cb343f5ea7cf724c4e1ad1058c4475d530e039..608a086a08643f2db76891c6a6d97c41c5badb3d 100755 (executable)
--- a/tests/nvme/044
+++ b/tests/nvme/044
@@ -26,7 +26,6 @@ test() {
        _setup_nvmet
 
        local port
-       local subsys_name="blktests-subsystem-1"
        local hostid
        local hostnqn
        local file_path="${TMPDIR}/img"
@@ -37,13 +36,13 @@ test() {
        hostid="${def_hostid}"
        hostnqn="${def_hostnqn}"
 
-       hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)"
+       hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
        if [ -z "$hostkey" ] ; then
                echo "failed to generate host key"
                return 1
        fi
 
-       ctrlkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)"
+       ctrlkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
        if [ -z "$ctrlkey" ] ; then
                echo "failed to generate ctrl key"
                return 1
@@ -51,29 +50,29 @@ test() {
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}"
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
-       _create_nvmet_host "${subsys_name}" "${hostnqn}" \
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
+       _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" \
                           "${hostkey}" "${ctrlkey}"
 
        _set_nvmet_dhgroup "${hostnqn}" "ffdhe2048"
 
        # Step 1: Connect with host authentication only
        echo "Test host authentication"
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                             --hostnqn "${hostnqn}" \
                             --hostid "${hostid}" \
                             --dhchap-secret "${hostkey}"
 
        udevadm settle
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
        # Step 2: Connect with host authentication
        # and invalid ctrl authentication
        echo "Test invalid ctrl authentication (should fail)"
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                             --hostnqn "${hostnqn}" \
                             --hostid "${hostid}" \
                             --dhchap-secret "${hostkey}" \
@@ -81,12 +80,12 @@ test() {
 
        udevadm settle
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
        # Step 3: Connect with host authentication
        # and valid ctrl authentication
        echo "Test valid ctrl authentication"
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                             --hostnqn "${hostnqn}" \
                             --hostid "${hostid}" \
                             --dhchap-secret "${hostkey}" \
@@ -94,13 +93,13 @@ test() {
 
        udevadm settle
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
        # 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 "${nvme_trtype}" "${subsys_name}" \
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                             --hostnqn "${hostnqn}" \
                             --hostid "${hostid}" \
                             --dhchap-secret "${hostkey}" \
@@ -108,10 +107,10 @@ test() {
 
        udevadm settle
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
 
        _remove_nvmet_port "${port}"
 

diff --git a/tests/nvme/045 b/tests/nvme/045
index 005d62d4f886e3da3882d9e4495f1155aa04e798..b8d886aaf9e8f68353958bfd89a5d44539f8816a 100755 (executable)
--- a/tests/nvme/045
+++ b/tests/nvme/045
@@ -27,7 +27,6 @@ test() {
        _setup_nvmet
 
        local port
-       local subsys_name="blktests-subsystem-1"
        local hostid
        local hostnqn
        local file_path="${TMPDIR}/img"
@@ -41,13 +40,13 @@ test() {
        hostid="${def_hostid}"
        hostnqn="${def_hostnqn}"
 
-       hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)"
+       hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
        if [ -z "$hostkey" ] ; then
                echo "failed to generate host key"
                return 1
        fi
 
-       ctrlkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)"
+       ctrlkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
        if [ -z "$ctrlkey" ] ; then
                echo "failed to generate ctrl key"
                return 1
@@ -55,14 +54,14 @@ test() {
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${file_path}"
+       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
-       _create_nvmet_host "${subsys_name}" "${hostnqn}" "${hostkey}" "${ctrlkey}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
+       _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" "${hostkey}" "${ctrlkey}"
 
        _set_nvmet_dhgroup "${hostnqn}" "ffdhe2048"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                             --hostnqn "${hostnqn}" \
                             --hostid "${hostid}" \
                             --dhchap-secret "${hostkey}" \
@@ -72,7 +71,7 @@ test() {
 
        echo "Re-authenticate with original host key"
 
-       ctrldev=$(_find_nvme_dev "${subsys_name}")
+       ctrldev=$(_find_nvme_dev "${def_subsysnqn}")
        if [ -z "$ctrldev" ] ; then
                echo "nvme controller not found"
        fi
@@ -81,7 +80,7 @@ test() {
 
        echo "Renew host key on the controller"
 
-       new_hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)"
+       new_hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
 
        _set_nvmet_hostkey "${hostnqn}" "${new_hostkey}"
 
@@ -91,7 +90,7 @@ test() {
 
        echo "Renew ctrl key on the controller"
 
-       new_ctrlkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)"
+       new_ctrlkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
 
        _set_nvmet_ctrlkey "${hostnqn}" "${new_ctrlkey}"
 
@@ -116,15 +115,15 @@ test() {
 
        echo "${new_hostkey}" > "${hostkey_file}"
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 
        rand_io_size="$(_nvme_calc_rand_io_size 4m)"
        _run_fio_rand_io --size="${rand_io_size}" --filename="/dev/${nvmedev}n1"
 
-       _nvme_disconnect_subsys "${subsys_name}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
 
        _remove_nvmet_port "${port}"
 

diff --git a/tests/nvme/047 b/tests/nvme/047
index 6a7599bc2e91f0ac45a054601ece77a466920ad2..b435dd3cecba004af6fddbd135348b03ae4261bb 100755 (executable)
--- a/tests/nvme/047
+++ b/tests/nvme/047
@@ -27,37 +27,36 @@ test() {
        local loop_dev
        local rand_io_size
        local file_path="$TMPDIR/img"
-       local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
        loop_dev="$(losetup -f --show "${file_path}")"
 
-       _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
-       _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
+       _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                --nr-write-queues 1 || echo FAIL
 
-       nvmedev=$(_find_nvme_dev "${subsys_name}")
+       nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 
        rand_io_size="$(_nvme_calc_rand_io_size 4M)"
        _run_fio_rand_io --filename="/dev/${nvmedev}n1" --size="${rand_io_size}"
 
-       _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
 
-       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \
+       _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                --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 "${subsys_name}" >> "$FULL" 2>&1
+       _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
        losetup -d "${loop_dev}"

diff --git a/tests/nvme/048 b/tests/nvme/048
index 6efcd7d6ab0301b2562e7cd293abc572e3f3aa1b..20d234e7262156031604684d31486aeebe1b0ad3 100755 (executable)
--- a/tests/nvme/048
+++ b/tests/nvme/048
@@ -85,8 +85,7 @@ test() {
 
        _setup_nvmet
 
-       local subsys_name="blktests-subsystem-1"
-       local cfs_path="${NVMET_CFS}/subsystems/${subsys_name}"
+       local cfs_path="${NVMET_CFS}/subsystems/${def_subsysnqn}"
        local file_path="${TMPDIR}/img"
        local skipped=false
        local hostnqn
@@ -98,34 +97,34 @@ test() {
 
        truncate -s "${nvme_img_size}" "${file_path}"
 
-       _create_nvmet_subsystem "${subsys_name}" "${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}" "${subsys_name}"
-       _create_nvmet_host "${subsys_name}" "${hostnqn}"
+       _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}" "${subsys_name}" \
+               _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \
                                        --hostnqn "${hostnqn}" \
                                        --hostid "${hostid}" \
                                        --keep-alive-tmo 1 \
                                        --reconnect-delay 2
 
-               if ! nvmf_wait_for_state "${subsys_name}" "live" ; then
+               if ! nvmf_wait_for_state "${def_subsysnqn}" "live" ; then
                        echo FAIL
                else
-                       set_qid_max "${port}" "${subsys_name}" 1 || echo FAIL
-                       set_qid_max "${port}" "${subsys_name}" 2 || echo FAIL
+                       set_qid_max "${port}" "${def_subsysnqn}" 1 || echo FAIL
+                       set_qid_max "${port}" "${def_subsysnqn}" 2 || echo FAIL
                fi
 
-               _nvme_disconnect_subsys "${subsys_name}"
+               _nvme_disconnect_subsys "${def_subsysnqn}"
        else
                SKIP_REASONS+=("missing attr_qid_max feature")
                skipped=true
        fi
 
-       _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
-       _remove_nvmet_subsystem "${subsys_name}"
+       _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
+       _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
        _remove_nvmet_host "${hostnqn}"