nvme: Use def_subsys_uuid variable

As all tests are using the same subsys uuid name anyway, use
the def_subsys_uuid 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/004 b/tests/nvme/004
index 78b11c7b84c5fe43cd5e5b05799f96d47cc34b31..54d74b61f689403ac8a7f337b3d53a03888a32fa 100755 (executable)
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -32,7 +32,7 @@ test() {
        loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"

diff --git a/tests/nvme/005 b/tests/nvme/005
index 211b8affc32a023116877c403259b01f03abb5ac..8e3ddfe75e2f905c5acf95b38437d33a204eef58 100755 (executable)
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -32,7 +32,7 @@ test() {
        loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"

diff --git a/tests/nvme/006 b/tests/nvme/006
index f31633825a70b0474f0bd193da2633acc724bcfd..910204aaeb908dad820493993a4f2bb99cccb5ab 100755 (executable)
--- a/tests/nvme/006
+++ b/tests/nvme/006
@@ -28,7 +28,7 @@ test() {
        loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/007 b/tests/nvme/007
index b6a4bc437103c8f1ba41fe58f81d3f792bc6c64a..db00bdcc2d08902afa5ef5ba4792f8170a497261 100755 (executable)
--- a/tests/nvme/007
+++ b/tests/nvme/007
@@ -24,7 +24,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/008 b/tests/nvme/008
index a38926ef0051b819319093573cdcb1bae5624993..752ab30a756b90c001e5fa5daac0a99d5bb4cf77 100755 (executable)
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -29,7 +29,7 @@ test() {
        loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/009 b/tests/nvme/009
index 2c8ea7ead9b84a40485453a6cff8e3d3f214125b..7debd837cc76a0120a9203285b44e6c6f0c840b9 100755 (executable)
--- a/tests/nvme/009
+++ b/tests/nvme/009
@@ -25,7 +25,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/010 b/tests/nvme/010
index 81f7d2024ee6f41f19bc418398294bc357483cb3..cba711b29af8d24f08acefbdb68198bc3ca5859b 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -29,7 +29,7 @@ test() {
        loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/011 b/tests/nvme/011
index e6f78867e283dfbfa72cd3a0904b8b2d35fc2db0..ba2718d81bd94845dcae477ffd5679ba6e80b990 100755 (executable)
--- a/tests/nvme/011
+++ b/tests/nvme/011
@@ -26,7 +26,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/012 b/tests/nvme/012
index 85549c25a1c609846d3acb62aceec12027cd1719..629b5194435e6dbcda3468c022d815b8b58b613e 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -33,7 +33,7 @@ test() {
        loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/013 b/tests/nvme/013
index 355bc2e03557c4bf5681a63e4efcacf45fb7ccf7..ca51544b82d1c3478e714914c0666d964f03b335 100755 (executable)
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -29,7 +29,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/014 b/tests/nvme/014
index 44ae91e2210fbea54145d7389a1e1f56879b5892..6d27300cfb30c5375784b9930a63a872929fde64 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -32,7 +32,7 @@ test() {
        loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
-                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+                "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/015 b/tests/nvme/015
index 16e41ee65d42bf6c3ad8797ef73835e0b02fd828..1b3aa4aa36c2858165f0edc66dfc44c3adf9e42c 100755 (executable)
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -29,7 +29,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+                "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/017 b/tests/nvme/017
index 7cbf274c13b0f2a6c2ae4854dba4608efcdf65d4..aa0a3fefae90aaaebb2487fbe3def773bdde1568 100755 (executable)
--- a/tests/nvme/017
+++ b/tests/nvme/017
@@ -26,7 +26,7 @@ test() {
        local genctr=1
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
 
        for ((i = 2; i <= iterations; i++)); do
                _create_nvmet_ns "${def_subsysnqn}" "${i}" "${def_file_path}"

diff --git a/tests/nvme/018 b/tests/nvme/018
index d1d2082e62ac58024b89854103b83a6ee02b29f9..b66056d43041341d30431dffb3ce27107f058415 100755 (executable)
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -27,7 +27,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+                "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/019 b/tests/nvme/019
index 2628dea55ac807cd14ec123cdddbaa9fcdc72d71..b456b38d038e463662cbccf1c9108b55df883f43 100755 (executable)
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -31,7 +31,7 @@ test() {
        loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/020 b/tests/nvme/020
index 4a4f3c12da30f24e227d642a9132c37b2f998ac3..ba88921d75af6fb48eb2d49aada9025fa1b022e3 100755 (executable)
--- a/tests/nvme/020
+++ b/tests/nvme/020
@@ -27,7 +27,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/021 b/tests/nvme/021
index 11f82d64f378129f8c5e94f48bb8a1614decc87a..02ef9727ee59c03f29566f40beb2ecd0c6bfa671 100755 (executable)
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -26,7 +26,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/022 b/tests/nvme/022
index 586f6cdd3448f9cd4452267d32257697bed7f5fc..74c12c3e0ba9c4557490c1256ec00e327e7dafc9 100755 (executable)
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -26,7 +26,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/023 b/tests/nvme/023
index b13426cf5615a2f7c977851d0f9abc46b882830b..413b6afa6d14eee8996edf90d0a878550962bc3c 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -29,7 +29,7 @@ test() {
        loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/024 b/tests/nvme/024
index b7c7b3f64321e34d649b3863195a837f5c119060..1baf5487ae64a0919f10675cbba65c1de18d3a05 100755 (executable)
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -26,7 +26,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/025 b/tests/nvme/025
index 04ceace5840bb997f423cbea9be2479005926a10..9eecd4d4a6046d09b0ea51038938f51c262a0511 100755 (executable)
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -26,7 +26,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/026 b/tests/nvme/026
index a9dc7bc15db5e4a00ea4670b662284169fb180c9..8a8bc58170e2485f1ef6eef64933e450e5548564 100755 (executable)
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -26,7 +26,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/027 b/tests/nvme/027
index fda8c61405a5f7e2bcd33cc4d2a37514b4f033fd..723e721202be21dc3f4ff65cba9f407a10b2ee3f 100755 (executable)
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -26,7 +26,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/028 b/tests/nvme/028
index 8e42ea37a634520fe8a4ce7079e5f7e9de1efee2..d4e62e8cae1c01b4b310a7c3c10e0e13bd4b0668 100755 (executable)
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -26,7 +26,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/029 b/tests/nvme/029
index 7988faf5dd0385ebe376d346edcf91a1f4519173..b113e387f1fa4891ae67253a25080555ec2c06c0 100755 (executable)
--- a/tests/nvme/029
+++ b/tests/nvme/029
@@ -62,7 +62,7 @@ test() {
        loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
-                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+                "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/041 b/tests/nvme/041
index 0a0700533b7bb9f2fcdd86a7734d6669f169ee7a..cb2766619b0e814ea57d23021f71c6da3cdbcfeb 100755 (executable)
--- a/tests/nvme/041
+++ b/tests/nvme/041
@@ -37,7 +37,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "b92842df-a394-44b1-84a4-92ae7d112861"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
        _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}"

diff --git a/tests/nvme/047 b/tests/nvme/047
index 66032f679ae298a70ba501c1089d8f82b11ae61c..2b81f7ea9ffd820556f49fba63c485108d623b03 100755 (executable)
--- a/tests/nvme/047
+++ b/tests/nvme/047
@@ -32,7 +32,7 @@ test() {
        loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
-               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
 

diff --git a/tests/nvme/048 b/tests/nvme/048
index 6a05feae9b823006d6072213a9359dd2997130f3..19234a5b3791f4068c4f9e870fb08ec8b1dd7b77 100755 (executable)
--- a/tests/nvme/048
+++ b/tests/nvme/048
@@ -92,7 +92,7 @@ test() {
        truncate -s "${nvme_img_size}" "${def_file_path}"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
-               "b92842df-a394-44b1-84a4-92ae7d112861"
+               "${def_subsys_uuid}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
 
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"