Skip to content

Commit 7641622

Browse files
dwsusekawasaki
dwsuse
authored and
kawasaki
committed
nvme: Use def_subsysnqn variable instead local variable
As all tests are using the same subsystem nqn anyway, use the def_subsysnqn variable and drop the local subsys_name variable. Signed-off-by: Daniel Wagner <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Signed-off-by: Shin'ichiro Kawasaki <[email protected]>
1 parent 8b1b020 commit 7641622

40 files changed

Lines changed: 266 additions & 297 deletions

File tree

‎tests/nvme/003‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ test() {
2929

3030
loop_dev="$(losetup -f)"
3131

32-
_create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}"
33-
_add_nvmet_subsys_to_port "${port}" "blktests-subsystem-1"
32+
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}"
33+
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
3434

3535
_nvme_connect_subsys "${nvme_trtype}" nqn.2014-08.org.nvmexpress.discovery
3636

@@ -46,8 +46,8 @@ test() {
4646
fi
4747

4848
_nvme_disconnect_subsys nqn.2014-08.org.nvmexpress.discovery
49-
_remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1"
50-
_remove_nvmet_subsystem "blktests-subsystem-1"
49+
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
50+
_remove_nvmet_subsystem "${def_subsysnqn}"
5151
_remove_nvmet_port "${port}"
5252

5353
echo "Test complete"

‎tests/nvme/004‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ test() {
3131

3232
loop_dev="$(losetup -f --show "$TMPDIR/img")"
3333

34-
_create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \
34+
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3535
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
36-
_add_nvmet_subsys_to_port "${port}" "blktests-subsystem-1"
36+
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
3737

38-
_nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1
38+
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3939

4040
local nvmedev
41-
nvmedev=$(_find_nvme_dev "blktests-subsystem-1")
41+
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
4242
cat "/sys/block/${nvmedev}n1/uuid"
4343
cat "/sys/block/${nvmedev}n1/wwid"
4444

45-
_nvme_disconnect_subsys blktests-subsystem-1
46-
_remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1"
47-
_remove_nvmet_subsystem "blktests-subsystem-1"
45+
_nvme_disconnect_subsys ${def_subsysnqn}
46+
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
47+
_remove_nvmet_subsystem "${def_subsysnqn}"
4848
_remove_nvmet_port "${port}"
4949
losetup -d "$loop_dev"
5050
rm "$TMPDIR/img"

‎tests/nvme/005‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ test() {
3131

3232
loop_dev="$(losetup -f --show "$TMPDIR/img")"
3333

34-
_create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \
34+
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3535
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
36-
_add_nvmet_subsys_to_port "${port}" "blktests-subsystem-1"
36+
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
3737

38-
_nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1
38+
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3939

40-
nvmedev=$(_find_nvme_dev "blktests-subsystem-1")
40+
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
4141

4242
udevadm settle
4343

4444
echo 1 > "/sys/class/nvme/${nvmedev}/reset_controller"
4545

4646
_nvme_disconnect_ctrl "${nvmedev}"
47-
_remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1"
47+
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
4848
_remove_nvmet_port "${port}"
4949

50-
_remove_nvmet_subsystem "blktests-subsystem-1"
50+
_remove_nvmet_subsystem "${def_subsysnqn}"
5151
losetup -d "$loop_dev"
5252
rm "$TMPDIR/img"
5353

‎tests/nvme/006‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,18 @@ test() {
2222

2323
local port
2424
local loop_dev
25-
local subsys_name="blktests-subsystem-1"
2625

2726
truncate -s "${nvme_img_size}" "$TMPDIR/img"
2827

2928
loop_dev="$(losetup -f --show "$TMPDIR/img")"
3029

31-
_create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
30+
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3231
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
3332
port="$(_create_nvmet_port "${nvme_trtype}")"
34-
_add_nvmet_subsys_to_port "${port}" "${subsys_name}"
33+
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
3534

36-
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
37-
_remove_nvmet_subsystem "${subsys_name}"
35+
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
36+
_remove_nvmet_subsystem "${def_subsysnqn}"
3837
_remove_nvmet_port "${port}"
3938

4039
losetup -d "$loop_dev"

‎tests/nvme/007‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,18 @@ test() {
2121

2222
local port
2323
local file_path
24-
local subsys_name="blktests-subsystem-1"
2524

2625
file_path="${TMPDIR}/img"
2726

2827
truncate -s "${nvme_img_size}" "${file_path}"
2928

30-
_create_nvmet_subsystem "${subsys_name}" "${file_path}" \
29+
_create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
3130
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
3231
port="$(_create_nvmet_port "${nvme_trtype}")"
33-
_add_nvmet_subsys_to_port "${port}" "${subsys_name}"
32+
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
3433

35-
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
36-
_remove_nvmet_subsystem "${subsys_name}"
34+
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
35+
_remove_nvmet_subsystem "${def_subsysnqn}"
3736
_remove_nvmet_port "${port}"
3837

3938
rm "${file_path}"

‎tests/nvme/008‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,28 @@ test() {
2424
local nvmedev
2525
local loop_dev
2626
local file_path="$TMPDIR/img"
27-
local subsys_name="blktests-subsystem-1"
2827

2928
truncate -s "${nvme_img_size}" "${file_path}"
3029

3130
loop_dev="$(losetup -f --show "${file_path}")"
3231

33-
_create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
32+
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3433
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
3534
port="$(_create_nvmet_port "${nvme_trtype}")"
36-
_add_nvmet_subsys_to_port "${port}" "${subsys_name}"
35+
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
3736

38-
_nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
37+
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3938

40-
nvmedev=$(_find_nvme_dev "${subsys_name}")
39+
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
4140
cat "/sys/block/${nvmedev}n1/uuid"
4241
cat "/sys/block/${nvmedev}n1/wwid"
4342

4443
udevadm settle
4544

46-
_nvme_disconnect_subsys "${subsys_name}"
45+
_nvme_disconnect_subsys "${def_subsysnqn}"
4746

48-
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
49-
_remove_nvmet_subsystem "${subsys_name}"
47+
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
48+
_remove_nvmet_subsystem "${def_subsysnqn}"
5049
_remove_nvmet_port "${port}"
5150

5251
losetup -d "${loop_dev}"

‎tests/nvme/009‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,26 @@ test() {
2222
local port
2323
local nvmedev
2424
local file_path="$TMPDIR/img"
25-
local subsys_name="blktests-subsystem-1"
2625

2726
truncate -s "${nvme_img_size}" "${file_path}"
2827

29-
_create_nvmet_subsystem "${subsys_name}" "${file_path}" \
28+
_create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
3029
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
3130
port="$(_create_nvmet_port "${nvme_trtype}")"
32-
_add_nvmet_subsys_to_port "${port}" "${subsys_name}"
31+
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
3332

34-
_nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
33+
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3534

36-
nvmedev=$(_find_nvme_dev "${subsys_name}")
35+
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
3736
cat "/sys/block/${nvmedev}n1/uuid"
3837
cat "/sys/block/${nvmedev}n1/wwid"
3938

4039
udevadm settle
4140

42-
_nvme_disconnect_subsys "${subsys_name}"
41+
_nvme_disconnect_subsys "${def_subsysnqn}"
4342

44-
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
45-
_remove_nvmet_subsystem "${subsys_name}"
43+
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
44+
_remove_nvmet_subsystem "${def_subsysnqn}"
4645
_remove_nvmet_port "${port}"
4746

4847
rm "${file_path}"

‎tests/nvme/010‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,29 @@ test() {
2424
local nvmedev
2525
local loop_dev
2626
local file_path="${TMPDIR}/img"
27-
local subsys_name="blktests-subsystem-1"
2827

2928
truncate -s "${nvme_img_size}" "${file_path}"
3029

3130
loop_dev="$(losetup -f --show "${file_path}")"
3231

33-
_create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
32+
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3433
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
3534
port="$(_create_nvmet_port "${nvme_trtype}")"
36-
_add_nvmet_subsys_to_port "${port}" "${subsys_name}"
35+
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
3736

38-
_nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
37+
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3938

40-
nvmedev=$(_find_nvme_dev "${subsys_name}")
39+
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
4140
cat "/sys/block/${nvmedev}n1/uuid"
4241
cat "/sys/block/${nvmedev}n1/wwid"
4342

4443
_run_fio_verify_io --size="${nvme_img_size}" \
4544
--filename="/dev/${nvmedev}n1"
4645

47-
_nvme_disconnect_subsys "${subsys_name}"
46+
_nvme_disconnect_subsys "${def_subsysnqn}"
4847

49-
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
50-
_remove_nvmet_subsystem "${subsys_name}"
48+
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
49+
_remove_nvmet_subsystem "${def_subsysnqn}"
5150
_remove_nvmet_port "${port}"
5251

5352
losetup -d "${loop_dev}"

‎tests/nvme/011‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,27 @@ test() {
2424
local nvmedev
2525
local file_path
2626
local file_path="${TMPDIR}/img"
27-
local subsys_name="blktests-subsystem-1"
2827

2928
truncate -s "${nvme_img_size}" "${file_path}"
3029

31-
_create_nvmet_subsystem "${subsys_name}" "${file_path}" \
30+
_create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
3231
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
3332
port="$(_create_nvmet_port "${nvme_trtype}")"
34-
_add_nvmet_subsys_to_port "${port}" "${subsys_name}"
33+
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
3534

36-
_nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
35+
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3736

38-
nvmedev=$(_find_nvme_dev "${subsys_name}")
37+
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
3938
cat "/sys/block/${nvmedev}n1/uuid"
4039
cat "/sys/block/${nvmedev}n1/wwid"
4140

4241
_run_fio_verify_io --size="${nvme_img_size}" \
4342
--filename="/dev/${nvmedev}n1"
4443

45-
_nvme_disconnect_subsys "${subsys_name}"
44+
_nvme_disconnect_subsys "${def_subsysnqn}"
4645

47-
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
48-
_remove_nvmet_subsystem "${subsys_name}"
46+
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
47+
_remove_nvmet_subsystem "${def_subsysnqn}"
4948
_remove_nvmet_port "${port}"
5049

5150
rm "${file_path}"

‎tests/nvme/012‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,28 @@ test() {
2828
local nvmedev
2929
local loop_dev
3030
local file_path="${TMPDIR}/img"
31-
local subsys_name="blktests-subsystem-1"
3231

3332
truncate -s "${nvme_img_size}" "${file_path}"
3433

3534
loop_dev="$(losetup -f --show "${file_path}")"
3635

37-
_create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \
36+
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3837
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
3938
port="$(_create_nvmet_port "${nvme_trtype}")"
40-
_add_nvmet_subsys_to_port "${port}" "${subsys_name}"
39+
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
4140

42-
_nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
41+
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
4342

44-
nvmedev=$(_find_nvme_dev "${subsys_name}")
43+
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
4544
cat "/sys/block/${nvmedev}n1/uuid"
4645
cat "/sys/block/${nvmedev}n1/wwid"
4746

4847
_xfs_run_fio_verify_io "/dev/${nvmedev}n1"
4948

50-
_nvme_disconnect_subsys "${subsys_name}"
49+
_nvme_disconnect_subsys "${def_subsysnqn}"
5150

52-
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
53-
_remove_nvmet_subsystem "${subsys_name}"
51+
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
52+
_remove_nvmet_subsystem "${def_subsysnqn}"
5453
_remove_nvmet_port "${port}"
5554

5655
losetup -d "${loop_dev}"

0 commit comments

Comments
 (0)