tests/nvme: restrict tests to specific transports

Protect against running tests with the wrong transport type. Most tests
cannot have nvme_trtype=nvme and discovery tests expect the $trtype to
be written and verified in the .out file. Adding a couple of helpers
to restrict the transport types in tests.

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

diff --git a/tests/nvme/002 b/tests/nvme/002
index 955f68da026a668bacbb787cbb2d3a9e091ecc03..ca11c11c9a09fb25f940297c9168a3cd03a30ca3 100755 (executable)
--- a/tests/nvme/002
+++ b/tests/nvme/002
@@ -12,6 +12,7 @@ DESCRIPTION="create many subsystems and test discovery"
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_loop
 }
 
 test() {

diff --git a/tests/nvme/003 b/tests/nvme/003
index 654ff776f6f9b76e6a6f5f9d68aac1077042e993..101c1841c6df526bd7143b652c56c500c1ee58f1 100755 (executable)
--- a/tests/nvme/003
+++ b/tests/nvme/003
@@ -13,6 +13,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/004 b/tests/nvme/004
index 0a62e3448e7b6a96cfb3fa450d96e6ff6df2d062..dfca79aab20c2210e4ee787aede04b38cde4a081 100755 (executable)
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -14,6 +14,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/005 b/tests/nvme/005
index e97287a96a4ecbf6ef0bbe460951bef920cbba9a..0d5801868bc0a31f8b31db0283272b8c71f0a7f9 100755 (executable)
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -14,6 +14,7 @@ requires() {
        _nvme_requires
        _have_modules loop && \
                _have_module_param_value nvme_core multipath Y
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/006 b/tests/nvme/006
index 8fe95461e6ccb8ddd7514e243e314dfea320b82b..9230dc6ed902e115b1603200b8c31f3ed3d35f9f 100755 (executable)
--- a/tests/nvme/006
+++ b/tests/nvme/006
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/007 b/tests/nvme/007
index e712026ba3734897b3f024ce84398c55e9681d27..d53100f3ff7b7d6d2c844b5f310e31658997f4a5 100755 (executable)
--- a/tests/nvme/007
+++ b/tests/nvme/007
@@ -11,6 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/008 b/tests/nvme/008
index cb36442bda182371f36c9e341a0b468be04d5ab5..8616617ad3981b45fbf0b3f23f24835dc310762f 100755 (executable)
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/009 b/tests/nvme/009
index 6abca757b4e67dc6fa54dc595098cf0aba194936..e91d79065cb125090d6de139bd534dd0156bc26d 100755 (executable)
--- a/tests/nvme/009
+++ b/tests/nvme/009
@@ -11,6 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/010 b/tests/nvme/010
index 903da818b5ac8b5318006a2883ebe1ccba3a0eff..9d96d7803be3da04dce94dd0d9f88b1b34a90ff5 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -12,6 +12,7 @@ TIMED=1
 requires() {
        _nvme_requires
        _have_fio _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/011 b/tests/nvme/011
index 4060e6278d441606ca19eaebd8dc853febd7760d..06dc568fb6ea6ff085298ad2382fe415911817b1 100755 (executable)
--- a/tests/nvme/011
+++ b/tests/nvme/011
@@ -12,6 +12,7 @@ TIMED=1
 requires() {
        _nvme_requires
        _have_fio
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/012 b/tests/nvme/012
index dd8bceca53730fd2180c07604ac49182a5f01a66..8110430e49d4b8d1d62f54b83a6b6a65e90a3533 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -13,6 +13,7 @@ requires() {
        _nvme_requires
        _have_program mkfs.xfs && _have_program fio && \
                _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/013 b/tests/nvme/013
index 059d608a892f571276450f97fb268c28e509bb81..176b11b9ccb5f3a4c7cd0d449e588af31142b161 100755 (executable)
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -12,6 +12,7 @@ TIMED=1
 requires() {
        _nvme_requires
        _have_program mkfs.xfs && _have_fio
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/014 b/tests/nvme/014
index 192322862072e1816162425c7d77244e075f36ff..e3c70364e3325bb06241d313ee8192c7dea47b39 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/015 b/tests/nvme/015
index 353445ad31b9c9b882202c32db6f744d8177120b..46fa4f605749d747c5e98aedd16082207f090044 100755 (executable)
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/016 b/tests/nvme/016
index f829dedf7baae1869b54566b2b57f5953331687b..4eba30223a0847fd87f8982eb48e418ddc8f0a4c 100755 (executable)
--- a/tests/nvme/016
+++ b/tests/nvme/016
@@ -10,6 +10,7 @@ DESCRIPTION="create/delete many NVMeOF block device-backed ns and test discovery
 
 requires() {
        _nvme_requires
+       _require_nvme_trtype_is_loop
 }
 
 test() {

diff --git a/tests/nvme/017 b/tests/nvme/017
index e552af17ccb98410bafc7d4b52fa324221469ac8..f2a95cf276cbcda787c073912e663b82bc4edb8a 100755 (executable)
--- a/tests/nvme/017
+++ b/tests/nvme/017
@@ -10,6 +10,7 @@ DESCRIPTION="create/delete many file-ns and test discovery"
 
 requires() {
        _nvme_requires
+       _require_nvme_trtype_is_loop
 }
 
 test() {

diff --git a/tests/nvme/018 b/tests/nvme/018
index 73703a286ff874d7e19cf34efc7b57724cc2a832..6d7934d09d9996175be7036ee4ff321359411500 100755 (executable)
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -13,6 +13,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/019 b/tests/nvme/019
index 8ccfface176e38be2146e7e10abd1904b6777215..486b5acff713a3fcf3945dde26162d6e9f065bb0 100755 (executable)
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/020 b/tests/nvme/020
index 7861d47513e52bf94d065de970ad702c0cd4abd7..c8053f440e2e27ed71cce96489cc34657048b8fa 100755 (executable)
--- a/tests/nvme/020
+++ b/tests/nvme/020
@@ -11,6 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/021 b/tests/nvme/021
index 52d14f0490b11cab060ea3f97b74e43711f27888..f543a1d8fd92c1aba4fc246f8a256e0656c5b1c7 100755 (executable)
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/022 b/tests/nvme/022
index 111dec92f791c9a8d66cd1c6ba1d269c34fc9e40..e824ed31f6f0350b4d1131fafbae90b1969ae35a 100755 (executable)
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/023 b/tests/nvme/023
index 31f77ff07055693f05cda7fcbf5f303cad53c2a1..bdef3dc8abca89e43755efed21c789823a82d0df 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/024 b/tests/nvme/024
index 5a30b08b9d8efc89f87d649548aed2541af5bf2e..78f779e8a08a09180844a6ea1a8cb8c1da9d219b 100755 (executable)
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/025 b/tests/nvme/025
index b7903d6ad8f205f12994a3acabadcbb9428e4071..223430965d7eaa3d8a3d99bba1d175dbde32f6fa 100755 (executable)
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/026 b/tests/nvme/026
index 721d486bc7de60fb8ffc4fd3fc35701b63e5abf8..7f82284d9c57fda39b9b1e061f4cb306eac2f423 100755 (executable)
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/027 b/tests/nvme/027
index 6be7d0492d37e286f58433728ade62c6ac409d7f..da96e6c5008d3600646696cd63be5f2628992e73 100755 (executable)
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/028 b/tests/nvme/028
index 2d89c8fa35de9a28819ac891e379d3d77ff0be92..f826b67623f1e1de06bf9c497b164377f6d31c5c 100755 (executable)
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/029 b/tests/nvme/029
index 0bface97ccd5853006e937f6baa42dd73972c3f6..5bed9b8e70aecaeba9f8b461d066c5649a98a647 100755 (executable)
--- a/tests/nvme/029
+++ b/tests/nvme/029
@@ -13,6 +13,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test_user_io()

diff --git a/tests/nvme/030 b/tests/nvme/030
index 91c042ab6b0bbeea49b1588d5b17d5585b570318..37df902da8952a46b3c690593e822c8091865f85 100755 (executable)
--- a/tests/nvme/030
+++ b/tests/nvme/030
@@ -12,6 +12,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 

diff --git a/tests/nvme/031 b/tests/nvme/031
index 3faa4c171cc821d7cb06d9aaa551ac2496c43c5e..36263ca2379c829637f80934f545dc3445ec3f74 100755 (executable)
--- a/tests/nvme/031
+++ b/tests/nvme/031
@@ -20,6 +20,7 @@ QUICK=1
 requires() {
        _nvme_requires
        _have_modules loop
+       _require_nvme_trtype_is_fabrics
 }
 
 test() {

diff --git a/tests/nvme/rc b/tests/nvme/rc
index 621686abf80a23dc9d299acf8fe4f570bbe8eda5..3b8754669af7da397943917bd2c8ae0af1bd3591 100644 (file)
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -46,6 +46,22 @@ _require_test_dev_is_nvme() {
        return 0
 }
 
+_require_nvme_trtype_is_loop() {
+       if [[ "${nvme_trtype}" != "loop" ]]; then
+               SKIP_REASON="nvme_trtype=${nvme_trtype} is not supported in this test"
+               return 1
+       fi
+       return 0
+}
+
+_require_nvme_trtype_is_fabrics() {
+       if [[ "${nvme_trtype}" == "pci" ]]; then
+               SKIP_REASON="nvme_trtype=${nvme_trtype} is not supported in this test"
+               return 1
+       fi
+       return 0
+}
+
 _cleanup_nvmet() {
        local dev
        local port