From: Daniel Wagner Date: Fri, 11 Aug 2023 09:36:11 +0000 (+0200) Subject: nvme: Use def_subsys_uuid variable X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1b41e0e70fa8c802524c1caa7ce052669687f251;p=users%2Fsagi%2Fblktests.git 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 Reviewed-by: Hannes Reinecke Signed-off-by: Shin'ichiro Kawasaki --- diff --git a/tests/nvme/004 b/tests/nvme/004 index 78b11c7..54d74b6 100755 --- 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 211b8af..8e3ddfe 100755 --- 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 f316338..910204a 100755 --- 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 b6a4bc4..db00bdc 100755 --- 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 a38926e..752ab30 100755 --- 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 2c8ea7e..7debd83 100755 --- 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 81f7d20..cba711b 100755 --- 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 e6f7886..ba2718d 100755 --- 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 85549c2..629b519 100755 --- 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 355bc2e..ca51544 100755 --- 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 44ae91e..6d27300 100755 --- 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 16e41ee..1b3aa4a 100755 --- 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 7cbf274..aa0a3fe 100755 --- 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 d1d2082..b66056d 100755 --- 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 2628dea..b456b38 100755 --- 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 4a4f3c1..ba88921 100755 --- 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 11f82d6..02ef972 100755 --- 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 586f6cd..74c12c3 100755 --- 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 b13426c..413b6af 100755 --- 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 b7c7b3f..1baf548 100755 --- 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 04ceace..9eecd4d 100755 --- 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 a9dc7bc..8a8bc58 100755 --- 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 fda8c61..723e721 100755 --- 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 8e42ea3..d4e62e8 100755 --- 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 7988faf..b113e38 100755 --- 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 0a07005..cb27666 100755 --- 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 66032f6..2b81f7e 100755 --- 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 6a05fea..19234a5 100755 --- 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}"