nvme: do not print UUID to log files

The UUID/wwid of a namespace might be assigned externally, so
we shouldn't register it in the 'out' files.
The current checks for UUID/wwid are just there to ensure that
if a UUID is present is should match the wwid setting.
So rather add a function _check_uuid() which does exactly that
and don't register the actual UUID in the 'out' files.

[Shin'ichiro: added check against def_subsys_uuid in _check_uuid()]

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

diff --git a/tests/nvme/004 b/tests/nvme/004
index 31af8737857b9f0cc75e0a69985215a15764665e..cc5310e78e0b7070a5818197ce78bcc5ef1d80e7 100755 (executable)
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -29,8 +29,7 @@ test() {
 
        local nvmedev
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        _nvme_disconnect_subsys ${def_subsysnqn}
 

diff --git a/tests/nvme/004.out b/tests/nvme/004.out
index 51f605227320a77820329078fac127201cdbfbd3..255990529c9d7385a619a18321fe31e488e990ae 100644 (file)
--- a/tests/nvme/004.out
+++ b/tests/nvme/004.out
@@ -1,5 +1,3 @@
 Running nvme/004
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete

diff --git a/tests/nvme/008 b/tests/nvme/008
index f4b45b2f1c11e1eea2e0896d36c6cc4ba1ded9b7..6ff3362e9c9b8dcbab31bf7401fae8bffd64995c 100755 (executable)
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -27,8 +27,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        _nvme_disconnect_subsys "${def_subsysnqn}"
 

diff --git a/tests/nvme/008.out b/tests/nvme/008.out
index b05b46d6bc7182e0e7ae81f8f5b345c6ad7f1ed8..62342e799d9b904cc217219d2bcefa62e5485c03 100644 (file)
--- a/tests/nvme/008.out
+++ b/tests/nvme/008.out
@@ -1,5 +1,3 @@
 Running nvme/008
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete

diff --git a/tests/nvme/009 b/tests/nvme/009
index 905de03005c927e8457d96e30be3cb07596a2d03..4ea00636e5ddd1a92644dfb8ee63e82429610a54 100755 (executable)
--- a/tests/nvme/009
+++ b/tests/nvme/009
@@ -26,8 +26,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        _nvme_disconnect_subsys "${def_subsysnqn}"
 

diff --git a/tests/nvme/009.out b/tests/nvme/009.out
index 7fd27ff90d83ba81a89b1f8573f119b3bb4d210e..853663ff0f3094d1f1b5106844277b6bc4b20d46 100644 (file)
--- a/tests/nvme/009.out
+++ b/tests/nvme/009.out
@@ -1,5 +1,3 @@
 Running nvme/009
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete

diff --git a/tests/nvme/010 b/tests/nvme/010
index e782a9bb06f31a2f98b9217deeaa47e85dfc36f8..5ed6cb5c0374817756ec702712d900839dd1bda2 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -27,8 +27,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        _run_fio_verify_io --size="${nvme_img_size}" \
                --filename="/dev/${nvmedev}n1"

diff --git a/tests/nvme/010.out b/tests/nvme/010.out
index 788ea968c6b85fae50b57fb0333c99836461e6f9..90468f5467b9f192f43f2c41d200964da7859230 100644 (file)
--- a/tests/nvme/010.out
+++ b/tests/nvme/010.out
@@ -1,5 +1,3 @@
 Running nvme/010
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete

diff --git a/tests/nvme/011 b/tests/nvme/011
index 56658f4d08f32b302505a155e0cdc5c6fa9c36fa..f9150e06434e9dd38fcbfbf1c619abe7c99a4116 100755 (executable)
--- a/tests/nvme/011
+++ b/tests/nvme/011
@@ -27,8 +27,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        _run_fio_verify_io --size="${nvme_img_size}" \
                --filename="/dev/${nvmedev}n1"

diff --git a/tests/nvme/011.out b/tests/nvme/011.out
index ab29fa218cd46ebb7cbb997f840afbd42f140eaf..a780def85e7157623fab11977d22e5b69584f6b0 100644 (file)
--- a/tests/nvme/011.out
+++ b/tests/nvme/011.out
@@ -1,5 +1,3 @@
 Running nvme/011
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete

diff --git a/tests/nvme/012 b/tests/nvme/012
index 6072eed3532aea66ad9eff7ba57afbab22a54275..c5e0eb9c5e2356e63e0622e0517a0ffb99702c64 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -31,8 +31,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        _xfs_run_fio_verify_io "/dev/${nvmedev}n1"
 

diff --git a/tests/nvme/012.out b/tests/nvme/012.out
index 581e686ac6f18522d5203e70264910a313752143..ec4bea82bff85251377c331e6e97385564b1fc68 100644 (file)
--- a/tests/nvme/012.out
+++ b/tests/nvme/012.out
@@ -1,5 +1,3 @@
 Running nvme/012
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete

diff --git a/tests/nvme/013 b/tests/nvme/013
index 60441cab10681da2e102596d43d5ecd25962a9fc..3ec280ff24cf51bc64e55ca88ea454e8dc1f4cc3 100755 (executable)
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -30,8 +30,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        _xfs_run_fio_verify_io "/dev/${nvmedev}n1"
 

diff --git a/tests/nvme/013.out b/tests/nvme/013.out
index f7285a9bd147bd863d861057bdbd29532aff0964..10b78ece8cb10b3de177c1cd22409b6fec3aec9a 100644 (file)
--- a/tests/nvme/013.out
+++ b/tests/nvme/013.out
@@ -1,5 +1,3 @@
 Running nvme/013
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete

diff --git a/tests/nvme/014 b/tests/nvme/014
index d49e8f3cce4d7ac8d004f4f1ee97ecd85d699470..31bfeb76d13d1f0ab68b53d29e3132e78a5b5cd3 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -30,8 +30,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        size="$(blockdev --getsize64 "/dev/${nvmedev}n1")"
        bs="$(blockdev --getbsz "/dev/${nvmedev}n1")"

diff --git a/tests/nvme/014.out b/tests/nvme/014.out
index 0285826f66e321bcbb5c883ead257cd1403898db..c431864162df17d691866ddaa9c6abee76fa7e46 100644 (file)
--- a/tests/nvme/014.out
+++ b/tests/nvme/014.out
@@ -1,6 +1,4 @@
 Running nvme/014
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 NVMe Flush: success
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete

diff --git a/tests/nvme/015 b/tests/nvme/015
index 0813bcf509e640d64b21eb203636ce9e34d742cc..4315ffa5757786080798a316b0f5371648c9315c 100755 (executable)
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -30,8 +30,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        size="$(blockdev --getsize64 "/dev/${nvmedev}n1")"
        bs="$(blockdev --getbsz "/dev/${nvmedev}n1")"

diff --git a/tests/nvme/015.out b/tests/nvme/015.out
index 23763f1d1a59b4c25028fa3a8ab3b00045e8c317..829cf4082a3c92649fc9f55bdea9678e813fcf05 100644 (file)
--- a/tests/nvme/015.out
+++ b/tests/nvme/015.out
@@ -1,6 +1,4 @@
 Running nvme/015
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 NVMe Flush: success
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete

diff --git a/tests/nvme/018 b/tests/nvme/018
index 00531cf2ec9833b8e895ca419040dff446d886b5..e90173098ec1bc2599bf707abe9113c3387e8c44 100755 (executable)
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -28,8 +28,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        local sectors
        local bs

diff --git a/tests/nvme/018.out b/tests/nvme/018.out
index 68a0194035fc11f0791796f469118f59b836ff84..6b0e8141b4e9c9b1024af9e86acf7bf6ada2105e 100644 (file)
--- a/tests/nvme/018.out
+++ b/tests/nvme/018.out
@@ -1,5 +1,3 @@
 Running nvme/018
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete

diff --git a/tests/nvme/019 b/tests/nvme/019
index 15e98c40134fba2688fc5798460c73c94d701641..a1035ff8d8c7df537db753997e7bc3dc07b9dad7 100755 (executable)
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -29,8 +29,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        nvme dsm "/dev/${nvmedev}" -n 1 -d -s "${sblk_range}" -b "${nblk_range}"
 

diff --git a/tests/nvme/019.out b/tests/nvme/019.out
index 3e649a4be044858eca6ada507dec558d68d70fe4..a52325fac677cc93af9cf270d37923c9ac23db21 100644 (file)
--- a/tests/nvme/019.out
+++ b/tests/nvme/019.out
@@ -1,6 +1,4 @@
 Running nvme/019
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 NVMe DSM: success
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete

diff --git a/tests/nvme/020 b/tests/nvme/020
index 59c1179d85e3e03d5b88cd3de42854bde339fa2e..ba3f4c8a5b3d5c3876426d73ee7e6c9d7d5a5b10 100755 (executable)
--- a/tests/nvme/020
+++ b/tests/nvme/020
@@ -28,8 +28,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        nvme dsm "/dev/${nvmedev}" -n 1 -d -s "${sblk_range}" -b "${nblk_range}"
 

diff --git a/tests/nvme/020.out b/tests/nvme/020.out
index 113c17790bdbbcb58e70c80d13b9b905cad98d23..9e293ab5453531e4fb8afb6495b447d4de109388 100644 (file)
--- a/tests/nvme/020.out
+++ b/tests/nvme/020.out
@@ -1,6 +1,4 @@
 Running nvme/020
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 NVMe DSM: success
 NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete

diff --git a/tests/nvme/021 b/tests/nvme/021
index 2277fe5227e401c10a239cb3486bde7c027e1e6b..7dc6a41b9f7b75c4cac4c0a8461384e34a9a9501 100755 (executable)
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -27,8 +27,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        if ! nvme list 2>> "$FULL" | grep -q "${nvmedev}n1"; then
                echo "ERROR: device not listed"

diff --git a/tests/nvme/021.out b/tests/nvme/021.out
index b6b1a7ce0f1754aef5b9aee9ecc0dcc30ef3cc11..c86ee7483afd42b8202ea2c6c1571099ae8444d9 100644 (file)
--- a/tests/nvme/021.out
+++ b/tests/nvme/021.out
@@ -1,4 +1,2 @@
 Running nvme/021
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 Test complete

diff --git a/tests/nvme/022 b/tests/nvme/022
index a74eba30fa590c1d2e7384a67037675a713b59d8..c70fbbae822eee84200eebda84dc3668f8893e68 100755 (executable)
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -27,8 +27,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        if ! nvme reset "/dev/${nvmedev}" >> "$FULL" 2>&1; then
                echo "ERROR: reset failed"

diff --git a/tests/nvme/022.out b/tests/nvme/022.out
index 1d393dbb645958b971ffc1f3211886001917a6b4..dace761237e96a3383b87c8ab3ee266a9454fc1f 100644 (file)
--- a/tests/nvme/022.out
+++ b/tests/nvme/022.out
@@ -1,4 +1,2 @@
 Running nvme/022
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 Test complete

diff --git a/tests/nvme/023 b/tests/nvme/023
index c8d1e4619822ebfc25ea45146c68c8680f801677..4e4d838ef6c91798064d88c3168ccebb378b3884 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -27,8 +27,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        if ! nvme smart-log "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then
                echo "ERROR: smart-log bdev-ns failed"

diff --git a/tests/nvme/023.out b/tests/nvme/023.out
index 47c99ca07aa9ed2ffcba79e751b2c501bfb5dbb6..aa5d29067d4069460c9a0237911c4af4d0952670 100644 (file)
--- a/tests/nvme/023.out
+++ b/tests/nvme/023.out
@@ -1,4 +1,2 @@
 Running nvme/023
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 Test complete

diff --git a/tests/nvme/024 b/tests/nvme/024
index d21bcce253ba4bd5a3d076c4b525405d9c8355a4..2535a9a78d23a33a2b4a8ada5a9bb86e024f141e 100755 (executable)
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -27,8 +27,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        if ! nvme smart-log "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then
                echo "ERROR: smart-log file-ns failed"

diff --git a/tests/nvme/024.out b/tests/nvme/024.out
index 0b1a3502f9378a1d31365e6198578462d318aa2f..76c3e29316867eec19eafaf9414e9f5af010bc11 100644 (file)
--- a/tests/nvme/024.out
+++ b/tests/nvme/024.out
@@ -1,4 +1,2 @@
 Running nvme/024
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 Test complete

diff --git a/tests/nvme/025 b/tests/nvme/025
index 5912e5d1a257ec671d6e5fdc0a63658fa2cc318c..46f6197cdfed0cd5ad3a8fdeecdc28f5e3a7ef50 100755 (executable)
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -27,8 +27,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        if ! nvme effects-log "/dev/${nvmedev}" >> "$FULL" 2>&1; then
                echo "ERROR: effects-log failed"

diff --git a/tests/nvme/025.out b/tests/nvme/025.out
index f15ff2ffe57a6ca1a464e01a759244307e6fc0d8..66d646e31b39e6a51304a4cc0f6bb2a25f1af39d 100644 (file)
--- a/tests/nvme/025.out
+++ b/tests/nvme/025.out
@@ -1,4 +1,2 @@
 Running nvme/025
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 Test complete

diff --git a/tests/nvme/026 b/tests/nvme/026
index b6bc779952b0d4e3ff33c8b469d2929978724edc..5a7d9927b44bc265b36aae480982472261482721 100755 (executable)
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -27,8 +27,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        if ! nvme ns-descs "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then
                echo "ERROR: ns-desc failed"

diff --git a/tests/nvme/026.out b/tests/nvme/026.out
index c934cac92af07738cccd9f866c293b43f7906065..69a05de2ee41193c14bb2b15d7b510dd9cb07a0f 100644 (file)
--- a/tests/nvme/026.out
+++ b/tests/nvme/026.out
@@ -1,4 +1,2 @@
 Running nvme/026
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 Test complete

diff --git a/tests/nvme/027 b/tests/nvme/027
index 3993fb5ff2ce1b0d60d568476ac43d1dc72e69f6..82b77a9636236e4fd74ab6258cebe89740b14e38 100755 (executable)
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -27,8 +27,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        if ! nvme ns-rescan "/dev/${nvmedev}" >> "$FULL" 2>&1; then
                echo "ERROR: ns-rescan failed"

diff --git a/tests/nvme/027.out b/tests/nvme/027.out
index 5c6ed263317ec40e64967d70dc522c02eb4d17b5..621a40401f581540c8bfa0e79952212e7bd6e0e5 100644 (file)
--- a/tests/nvme/027.out
+++ b/tests/nvme/027.out
@@ -1,4 +1,2 @@
 Running nvme/027
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 Test complete

diff --git a/tests/nvme/028 b/tests/nvme/028
index e52238150635afce749900c7abb958c73dee9bdf..0b49e2016d3023b7bb97782258baaa2cd526d0bb 100755 (executable)
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -27,8 +27,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        if ! nvme list-subsys 2>> "$FULL" | grep -q "${nvme_trtype}"; then
                echo "ERROR: list-subsys"

diff --git a/tests/nvme/028.out b/tests/nvme/028.out
index 536067f62fd0f4ec7b1bfe717d67350aaf1f6559..7cfd2d30d668abbf0e0d1d59af85793545b51d68 100644 (file)
--- a/tests/nvme/028.out
+++ b/tests/nvme/028.out
@@ -1,4 +1,2 @@
 Running nvme/028
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 Test complete

diff --git a/tests/nvme/029 b/tests/nvme/029
index bbc481437fc866cb4f524798646cc04844eb04ee..caed0f7ec476c558ad075ab67b703a4cd866a9a3 100755 (executable)
--- a/tests/nvme/029
+++ b/tests/nvme/029
@@ -60,8 +60,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
-       cat "/sys/block/${nvmedev}n1/uuid"
-       cat "/sys/block/${nvmedev}n1/wwid"
+       _check_uuid "${nvmedev}"
 
        local dev="/dev/${nvmedev}n1"
        test_user_io "$dev" 1 512 > "$FULL" 2>&1 || echo FAIL

diff --git a/tests/nvme/029.out b/tests/nvme/029.out
index 002100382c7ca134ce233172885b68e95c1d818d..745f142557a008f0f24bfdfc2f50dd648dc94071 100644 (file)
--- a/tests/nvme/029.out
+++ b/tests/nvme/029.out
@@ -1,4 +1,2 @@
 Running nvme/029
-91fdba0d-f87b-4c25-b80f-db7be1418b9e
-uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
 Test complete

diff --git a/tests/nvme/rc b/tests/nvme/rc
index 1cff522d85438e25f093a9bd98237d4cebc01190..44522743caf9be975d030db4a1f71003c3b87f8a 100644 (file)
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -959,6 +959,30 @@ _check_genctr() {
        echo "${genctr}"
 }
 
+_check_uuid() {
+       local nvmedev=$1
+       local nr_nsid=0
+
+       for ns in "/sys/block/${nvmedev}n"* ; do
+               [ -e "${ns}/wwid" ] || continue
+               nr_nsid=$((nr_nsid + 1))
+               [ -e "${ns}/uuid" ] || continue
+               uuid=$(cat "${ns}/uuid")
+               wwid=$(cat "${ns}/wwid")
+               if [ "${uuid}" != "${wwid#uuid.}" ]; then
+                       echo "UUID ${uuid} mismatch (wwid ${wwid})"
+                       return 1
+               elif [ "${uuid}" != "${def_subsys_uuid}" ]; then
+                       echo "UUID ${uuid} mismatch with ${def_subsys_uuid})"
+                       return 1
+               fi
+       done
+       if [ $nr_nsid -eq 0 ] ; then
+               echo "No namespaces found"
+               return 1
+       fi
+}
+
 declare -A NS_DEV_FAULT_INJECT_SAVE
 declare -A CTRL_DEV_FAULT_INJECT_SAVE