nvme: make tests transport type agnostic

Pass in nvme_trtype to common routines that can
support multiple transport types.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>

diff --git a/tests/nvme/002 b/tests/nvme/002
index 92779e8d28ca3c5986fc99e088579548fee23aed..955f68da026a668bacbb787cbb2d3a9e091ecc03 100755 (executable)
--- a/tests/nvme/002
+++ b/tests/nvme/002
@@ -21,7 +21,7 @@ test() {
 
        local iterations=1000
        local port
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
 
        local loop_dev
        loop_dev="$(losetup -f)"
@@ -31,7 +31,7 @@ test() {
                _add_nvmet_subsys_to_port "${port}" "blktests-subsystem-$i"
        done
 
-       _nvme_discover loop | _filter_discovery
+       _nvme_discover "${nvme_trtype}" | _filter_discovery
 
        for ((i = iterations - 1; i >= 0; i--)); do
                _remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-$i"

diff --git a/tests/nvme/003 b/tests/nvme/003
index 83d1b2ff9cb09957671bb0de5c0d78b0b795d376..654ff776f6f9b76e6a6f5f9d68aac1077042e993 100755 (executable)
--- a/tests/nvme/003
+++ b/tests/nvme/003
@@ -21,7 +21,7 @@ test() {
        _setup_nvmet
 
        local port
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
 
        local loop_dev
        loop_dev="$(losetup -f)"
@@ -29,7 +29,7 @@ test() {
        _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}"
        _add_nvmet_subsys_to_port "${port}" "blktests-subsystem-1"
 
-       _nvme_connect_subsys loop nqn.2014-08.org.nvmexpress.discovery
+       _nvme_connect_subsys "${nvme_trtype}" 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 1a3eedd634cf0d2411d209c06c4fb4d53bcc1fd5..0a62e3448e7b6a96cfb3fa450d96e6ff6df2d062 100755 (executable)
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -22,7 +22,7 @@ test() {
        _setup_nvmet
 
        local port
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
 
        truncate -s 1G "$TMPDIR/img"
 
@@ -33,10 +33,10 @@ test() {
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        _add_nvmet_subsys_to_port "${port}" "blktests-subsystem-1"
 
-       _nvme_connect_subsys loop blktests-subsystem-1
+       _nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1
 
        local nvmedev
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/005 b/tests/nvme/005
index f26adebe1b3b8225edbc85110045350f7451d56a..e97287a96a4ecbf6ef0bbe460951bef920cbba9a 100755 (executable)
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -22,7 +22,7 @@ test() {
        _setup_nvmet
 
        local port
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
 
        truncate -s 1G "$TMPDIR/img"
 
@@ -33,10 +33,10 @@ test() {
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        _add_nvmet_subsys_to_port "${port}" "blktests-subsystem-1"
 
-       _nvme_connect_subsys loop blktests-subsystem-1
+       _nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1
 
        local nvmedev
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
 
        udevadm settle
 

diff --git a/tests/nvme/006 b/tests/nvme/006
index 3f47613d52d2d4625a4445bb71a6acc105951623..8fe95461e6ccb8ddd7514e243e314dfea320b82b 100755 (executable)
--- a/tests/nvme/006
+++ b/tests/nvme/006
@@ -29,7 +29,7 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
        _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"

diff --git a/tests/nvme/007 b/tests/nvme/007
index 0902745a4ab2e61285d5848be44a44ffe51cd852..e712026ba3734897b3f024ce84398c55e9681d27 100755 (executable)
--- a/tests/nvme/007
+++ b/tests/nvme/007
@@ -28,7 +28,7 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
        _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"

diff --git a/tests/nvme/008 b/tests/nvme/008
index 91673974ecaa735bf7335cfd8d8bf979d9c98631..cb36442bda182371f36c9e341a0b468be04d5ab5 100755 (executable)
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -31,12 +31,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/009 b/tests/nvme/009
index ec586ec08780cf7c031a122ed53ef57d8be56163..6abca757b4e67dc6fa54dc595098cf0aba194936 100755 (executable)
--- a/tests/nvme/009
+++ b/tests/nvme/009
@@ -27,12 +27,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/010 b/tests/nvme/010
index e8055541746a3788a60554017ff2e88d5d1573d2..903da818b5ac8b5318006a2883ebe1ccba3a0eff 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -31,12 +31,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/011 b/tests/nvme/011
index 7e89c8e7b38eb8a9ef81f5c22f38bb5db46a5099..4060e6278d441606ca19eaebd8dc853febd7760d 100755 (executable)
--- a/tests/nvme/011
+++ b/tests/nvme/011
@@ -29,12 +29,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/012 b/tests/nvme/012
index 72cf93210bb9acc5448e8dd0420ede808c1738d0..dd8bceca53730fd2180c07604ac49182a5f01a66 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -35,12 +35,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/013 b/tests/nvme/013
index d70bd02df666fc9dac6b1a117d81bff7d9384a9b..059d608a892f571276450f97fb268c28e509bb81 100755 (executable)
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -32,12 +32,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/014 b/tests/nvme/014
index 2d83c4258f2ac662ce4b9a6313184a0656c730bf..192322862072e1816162425c7d77244e075f36ff 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -31,12 +31,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
                 "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/015 b/tests/nvme/015
index 118a261f38459ddab78ecd685ec4ae54f5b7ffee..353445ad31b9c9b882202c32db6f744d8177120b 100755 (executable)
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -28,12 +28,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                 "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/016 b/tests/nvme/016
index a2b22adfc6b9cbd809b2bfd300bff2e77c8f36af..f829dedf7baae1869b54566b2b57f5953331687b 100755 (executable)
--- a/tests/nvme/016
+++ b/tests/nvme/016
@@ -30,7 +30,7 @@ test() {
                _create_nvmet_ns "${subsys_nqn}" "${i}" "${loop_dev}"
        done
 
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "$port" "${subsys_nqn}"
 
        _nvme_discover loop | _filter_discovery

diff --git a/tests/nvme/017 b/tests/nvme/017
index 7ec146ec7414fc9389fa99c75dbfc145579e64f6..e552af17ccb98410bafc7d4b52fa324221469ac8 100755 (executable)
--- a/tests/nvme/017
+++ b/tests/nvme/017
@@ -33,7 +33,7 @@ test() {
                _create_nvmet_ns "${subsys_name}" "${i}" "${file_path}"
        done
 
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
        _nvme_discover loop | _filter_discovery

diff --git a/tests/nvme/018 b/tests/nvme/018
index 2dee7d1900062b1e7f0ac50bf9be85927521bb9b..73703a286ff874d7e19cf34efc7b57724cc2a832 100755 (executable)
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -29,12 +29,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                 "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/019 b/tests/nvme/019
index 58ee7c916f9de3903f831e1374d241363715b4b0..8ccfface176e38be2146e7e10abd1904b6777215 100755 (executable)
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -33,12 +33,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/020 b/tests/nvme/020
index 2615ab6b74b0fec0ed81ab218e204b3e52c7d945..7861d47513e52bf94d065de970ad702c0cd4abd7 100755 (executable)
--- a/tests/nvme/020
+++ b/tests/nvme/020
@@ -29,12 +29,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/021 b/tests/nvme/021
index 33f66c975553b9619e84ac75ab9811b57ac701a1..52d14f0490b11cab060ea3f97b74e43711f27888 100755 (executable)
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -28,12 +28,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/022 b/tests/nvme/022
index e223107a226b7603da9f45cbf9341abb7cda2545..111dec92f791c9a8d66cd1c6ba1d269c34fc9e40 100755 (executable)
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -28,12 +28,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/023 b/tests/nvme/023
index 190bac07dae62a07423895423d1c786630470a13..31f77ff07055693f05cda7fcbf5f303cad53c2a1 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -31,12 +31,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/024 b/tests/nvme/024
index 62c07478e8cef3e9aa8d5ebb5f65cd6ae979b2cf..5a30b08b9d8efc89f87d649548aed2541af5bf2e 100755 (executable)
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -28,12 +28,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/025 b/tests/nvme/025
index d760430518df2278f4e33dfa12ab380fc7e02df6..b7903d6ad8f205f12994a3acabadcbb9428e4071 100755 (executable)
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -28,12 +28,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/026 b/tests/nvme/026
index 40e894f89578edc2af8e79cf6db6e71283d2a298..721d486bc7de60fb8ffc4fd3fc35701b63e5abf8 100755 (executable)
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -28,12 +28,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/027 b/tests/nvme/027
index 23feabf9f871227e3b8b9b66db3919c6c8e0d5be..6be7d0492d37e286f58433728ade62c6ac409d7f 100755 (executable)
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -28,12 +28,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/028 b/tests/nvme/028
index bb67249c29476915330c97d22a45fdb507daffbe..2d89c8fa35de9a28819ac891e379d3d77ff0be92 100755 (executable)
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -28,16 +28,16 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
-       if ! nvme list-subsys 2>> "$FULL" | grep -q loop; then
+       if ! nvme list-subsys 2>> "$FULL" | grep -q "${nvme_trtype}"; then
                echo "ERROR: list-subsys"
        fi
        _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1

diff --git a/tests/nvme/029 b/tests/nvme/029
index 184a2f177d2dd3c4dd801ce5eb9ba69a78196063..0bface97ccd5853006e937f6baa42dd73972c3f6 100755 (executable)
--- a/tests/nvme/029
+++ b/tests/nvme/029
@@ -64,12 +64,12 @@ test() {
 
        _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
                 "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       _nvme_connect_subsys loop "${subsys_name}"
+       _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_loop_dev)"
+       nvmedev="$(_find_nvme_dev)"
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/030 b/tests/nvme/030
index 7156cad7b6574ad521b42780ad79f77242cbaca0..91c042ab6b0bbeea49b1588d5b17d5585b570318 100755 (executable)
--- a/tests/nvme/030
+++ b/tests/nvme/030
@@ -37,7 +37,7 @@ test() {
 
     _setup_nvmet
 
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
 
        _create_nvmet_subsystem "${subsys}1" "$(losetup -f)"
        _add_nvmet_subsys_to_port "${port}" "${subsys}1"

diff --git a/tests/nvme/031 b/tests/nvme/031
index 7053553cb83755f72de43214da5c137a2ea52b98..3faa4c171cc821d7cb06d9aaa551ac2496c43c5e 100755 (executable)
--- a/tests/nvme/031
+++ b/tests/nvme/031
@@ -36,12 +36,12 @@ test() {
 
        loop_dev="$(losetup -f --show "$TMPDIR/img")"
 
-       port="$(_create_nvmet_port "loop")"
+       port="$(_create_nvmet_port "${nvme_trtype}")"
 
        for ((i = 0; i < iterations; i++)); do
                _create_nvmet_subsystem "${subsys}$i" "${loop_dev}"
                _add_nvmet_subsys_to_port "${port}" "${subsys}$i"
-               _nvme_connect_subsys loop "${subsys}$i"
+               _nvme_connect_subsys "${nvme_trtype}" "${subsys}$i"
                _nvme_disconnect_subsys "${subsys}$i" >> "${FULL}" 2>&1
                _remove_nvmet_subsystem_from_port "${port}" "${subsys}$i"
                _remove_nvmet_subsystem "${subsys}$i"

diff --git a/tests/nvme/rc b/tests/nvme/rc
index e02cb3c346eef96aff0469b9d6a158c1f8b5861f..621686abf80a23dc9d299acf8fe4f570bbe8eda5 100644 (file)
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -6,6 +6,9 @@
 
 . common/rc
 
+def_traddr="127.0.0.1"
+def_adrfam="ipv4"
+def_trsvcid="4420"
 nvme_trtype=${nvme_trtype:-"loop"}
 
 _nvme_requires() {
@@ -62,8 +65,8 @@ _cleanup_nvmet() {
        for dev in /sys/class/nvme/nvme*; do
                dev="$(basename "$dev")"
                transport="$(cat "/sys/class/nvme/${dev}/transport")"
-               if [[ "$transport" == "loop" ]]; then
-                       echo "WARNING: Test did not clean up loop device: ${dev}"
+               if [[ "$transport" == "${nvme_trtype}" ]]; then
+                       echo "WARNING: Test did not clean up ${nvme_trtype} device: ${dev}"
                        _nvme_disconnect_ctrl "${dev}"
                fi
        done
@@ -87,14 +90,20 @@ _cleanup_nvmet() {
        shopt -u nullglob
        trap SIGINT
 
-       modprobe -r nvme-loop 2>/dev/null
+       modprobe -r nvme-"${nvme_trtype}" 2>/dev/null
+       if [[ "${nvme_trtype}" != "loop" ]]; then
+               modprobe -r nvmet-"${nvme_trtype}" 2>/dev/null
+       fi
        modprobe -r nvmet 2>/dev/null
 }
 
 _setup_nvmet() {
        _register_test_cleanup _cleanup_nvmet
        modprobe nvmet
-       modprobe nvme-loop
+       if [[ "${nvme_trtype}" != "loop" ]]; then
+               modprobe nvmet-"${nvme_trtype}"
+       fi
+       modprobe nvme-"${nvme_trtype}"
 }
 
 _nvme_disconnect_ctrl() {
@@ -112,20 +121,33 @@ _nvme_disconnect_subsys() {
 _nvme_connect_subsys() {
        local trtype="$1"
        local subsysnqn="$2"
+       local traddr="${3:-$def_traddr}"
+       local trsvcid="${4:-$def_trsvcid}"
 
        ARGS=(-t "${trtype}" -n "${subsysnqn}")
+       if [[ "${trtype}" != "loop" ]]; then
+               ARGS+=(-a "${traddr}" -s "${trsvcid}")
+       fi
        nvme connect "${ARGS[@]}"
 }
 
 _nvme_discover() {
        local trtype="$1"
+       local traddr="${2:-$def_traddr}"
+       local trsvcid="${3:-$def_trsvcid}"
 
        ARGS=(-t "${trtype}")
+       if [[ "${trtype}" != "loop" ]]; then
+               ARGS+=(-a "${traddr}" -s "${trsvcid}")
+       fi
        nvme discover "${ARGS[@]}"
 }
 
 _create_nvmet_port() {
        local trtype="$1"
+       local traddr="${2:-$def_traddr}"
+       local adrfam="${3:-$def_adrfam}"
+       local trsvcid="${4:-$def_trsvcid}"
 
        local port
        for ((port = 0; ; port++)); do
@@ -136,6 +158,9 @@ _create_nvmet_port() {
 
        mkdir "${NVMET_CFS}/ports/${port}"
        echo "${trtype}" > "${NVMET_CFS}/ports/${port}/addr_trtype"
+       echo "${traddr}" > "${NVMET_CFS}/ports/${port}/addr_traddr"
+       echo "${adrfam}" > "${NVMET_CFS}/ports/${port}/addr_adrfam"
+       echo "${trsvcid}" > "${NVMET_CFS}/ports/${port}/addr_trsvcid"
 
        echo "${port}"
 }
@@ -207,13 +232,13 @@ _remove_nvmet_subsystem_from_port() {
        rm "${NVMET_CFS}/ports/${port}/subsystems/${nvmet_subsystem}"
 }
 
-_find_nvme_loop_dev() {
+_find_nvme_dev() {
        local dev
        local transport
        for dev in /sys/class/nvme/nvme*; do
                dev="$(basename "$dev")"
                transport="$(cat "/sys/class/nvme/${dev}/transport")"
-               if [[ "$transport" == "loop" ]]; then
+               if [[ "$transport" == "${nvme_trtype}" ]]; then
                        echo "$dev"
                        for ((i = 0; i < 10; i++)); do
                                if [[ -e /sys/block/$dev/uuid &&
@@ -233,6 +258,6 @@ _filter_discovery() {
 }
 
 _discovery_genctr() {
-       _nvme_discover loop |
+       _nvme_discover "${nvme_trtype}" |
                sed -n -e 's/^.*Generation counter \([0-9]\+\).*$/\1/p'
 }