Skip to content

Commit a12281b

Browse files
dwsusekawasaki
dwsuse
authored and
kawasaki
committed
nvme: introduce nvmet_target_{setup/cleanup} common code
Almost all fabric tests have the identically code for setting up and cleaning up the target side. Introduce two new helpers. Reviewed-by: Chaitanya Kulkarni <[email protected]> Signed-off-by: Daniel Wagner <[email protected]> [Shin'ichiro: added missing "--blkdev file" option in nvme/018] Signed-off-by: Shin'ichiro Kawasaki <[email protected]>
1 parent 76a03c7 commit a12281b

34 files changed

Lines changed: 145 additions & 519 deletions

File tree

‎tests/nvme/003‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,8 @@ test() {
2222

2323
_setup_nvmet
2424

25-
local loop_dev
26-
local port
2725

28-
port="$(_create_nvmet_port "${nvme_trtype}")"
29-
30-
loop_dev="$(losetup -f)"
31-
32-
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}"
33-
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
26+
_nvmet_target_setup
3427

3528
_nvme_connect_subsys "${nvme_trtype}" nqn.2014-08.org.nvmexpress.discovery
3629

@@ -46,9 +39,8 @@ test() {
4639
fi
4740

4841
_nvme_disconnect_subsys nqn.2014-08.org.nvmexpress.discovery
49-
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
50-
_remove_nvmet_subsystem "${def_subsysnqn}"
51-
_remove_nvmet_port "${port}"
42+
43+
_nvmet_target_cleanup
5244

5345
echo "Test complete"
5446
}

‎tests/nvme/004‎

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

2323
_setup_nvmet
2424

25-
local port
26-
local loop_dev
2725

28-
port="$(_create_nvmet_port "${nvme_trtype}")"
29-
30-
truncate -s "${nvme_img_size}" "${def_file_path}"
31-
32-
loop_dev="$(losetup -f --show "${def_file_path}")"
33-
34-
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
35-
"${def_subsys_uuid}"
36-
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
37-
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
26+
_nvmet_target_setup
3827

3928
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
4029

@@ -44,12 +33,8 @@ test() {
4433
cat "/sys/block/${nvmedev}n1/wwid"
4534

4635
_nvme_disconnect_subsys ${def_subsysnqn}
47-
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
48-
_remove_nvmet_subsystem "${def_subsysnqn}"
49-
_remove_nvmet_port "${port}"
50-
_remove_nvmet_host "${def_hostnqn}"
51-
losetup -d "$loop_dev"
52-
rm "${def_file_path}"
36+
37+
_nvmet_target_cleanup
5338

5439
echo "Test complete"
5540
}

‎tests/nvme/005‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,9 @@ test() {
2121

2222
_setup_nvmet
2323

24-
local port
25-
local loop_dev
2624
local nvmedev
2725

28-
port="$(_create_nvmet_port "${nvme_trtype}")"
29-
30-
truncate -s "${nvme_img_size}" "${def_file_path}"
31-
32-
loop_dev="$(losetup -f --show "${def_file_path}")"
33-
34-
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
35-
"${def_subsys_uuid}"
36-
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
37-
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
26+
_nvmet_target_setup
3827

3928
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
4029

@@ -43,13 +32,8 @@ test() {
4332
echo 1 > "/sys/class/nvme/${nvmedev}/reset_controller"
4433

4534
_nvme_disconnect_ctrl "${nvmedev}"
46-
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
47-
_remove_nvmet_port "${port}"
48-
_remove_nvmet_subsystem "${def_subsysnqn}"
49-
_remove_nvmet_host "${def_hostnqn}"
5035

51-
losetup -d "$loop_dev"
52-
rm "${def_file_path}"
36+
_nvmet_target_cleanup
5337

5438
echo "Test complete"
5539
}

‎tests/nvme/006‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,10 @@ test() {
2020

2121
_setup_nvmet
2222

23-
local port
24-
local loop_dev
2523

26-
truncate -s "${nvme_img_size}" "${def_file_path}"
24+
_nvmet_target_setup
2725

28-
loop_dev="$(losetup -f --show "${def_file_path}")"
29-
30-
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
31-
"${def_subsys_uuid}"
32-
port="$(_create_nvmet_port "${nvme_trtype}")"
33-
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
34-
35-
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
36-
_remove_nvmet_subsystem "${def_subsysnqn}"
37-
_remove_nvmet_port "${port}"
38-
39-
losetup -d "$loop_dev"
40-
41-
rm "${def_file_path}"
26+
_nvmet_target_cleanup
4227

4328
echo "Test complete"
4429
}

‎tests/nvme/007‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,10 @@ test() {
1919

2020
_setup_nvmet
2121

22-
local port
2322

24-
truncate -s "${nvme_img_size}" "${def_file_path}"
23+
_nvmet_target_setup --blkdev file
2524

26-
_create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
27-
"${def_subsys_uuid}"
28-
port="$(_create_nvmet_port "${nvme_trtype}")"
29-
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
30-
31-
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
32-
_remove_nvmet_subsystem "${def_subsysnqn}"
33-
_remove_nvmet_port "${port}"
34-
35-
rm "${def_file_path}"
25+
_nvmet_target_cleanup
3626

3727
echo "Test complete"
3828
}

‎tests/nvme/008‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,9 @@ test() {
2020

2121
_setup_nvmet
2222

23-
local port
2423
local nvmedev
25-
local loop_dev
2624

27-
truncate -s "${nvme_img_size}" "${def_file_path}"
28-
29-
loop_dev="$(losetup -f --show "${def_file_path}")"
30-
31-
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
32-
"${def_subsys_uuid}"
33-
port="$(_create_nvmet_port "${nvme_trtype}")"
34-
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
35-
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
25+
_nvmet_target_setup
3626

3727
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3828

@@ -42,14 +32,7 @@ test() {
4232

4333
_nvme_disconnect_subsys "${def_subsysnqn}"
4434

45-
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
46-
_remove_nvmet_subsystem "${def_subsysnqn}"
47-
_remove_nvmet_port "${port}"
48-
_remove_nvmet_host "${def_hostnqn}"
49-
50-
losetup -d "${loop_dev}"
51-
52-
rm "${def_file_path}"
35+
_nvmet_target_cleanup
5336

5437
echo "Test complete"
5538
}

‎tests/nvme/009‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,9 @@ test() {
1919

2020
_setup_nvmet
2121

22-
local port
2322
local nvmedev
2423

25-
truncate -s "${nvme_img_size}" "${def_file_path}"
26-
27-
_create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
28-
"${def_subsys_uuid}"
29-
port="$(_create_nvmet_port "${nvme_trtype}")"
30-
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
31-
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
24+
_nvmet_target_setup --blkdev file
3225

3326
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3427

@@ -38,12 +31,7 @@ test() {
3831

3932
_nvme_disconnect_subsys "${def_subsysnqn}"
4033

41-
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
42-
_remove_nvmet_subsystem "${def_subsysnqn}"
43-
_remove_nvmet_port "${port}"
44-
_remove_nvmet_host "${def_hostnqn}"
45-
46-
rm "${def_file_path}"
34+
_nvmet_target_cleanup
4735

4836
echo "Test complete"
4937
}

‎tests/nvme/010‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,9 @@ test() {
2020

2121
_setup_nvmet
2222

23-
local port
2423
local nvmedev
25-
local loop_dev
2624

27-
truncate -s "${nvme_img_size}" "${def_file_path}"
28-
29-
loop_dev="$(losetup -f --show "${def_file_path}")"
30-
31-
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
32-
"${def_subsys_uuid}"
33-
port="$(_create_nvmet_port "${nvme_trtype}")"
34-
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
35-
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
25+
_nvmet_target_setup
3626

3727
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3828

@@ -45,14 +35,7 @@ test() {
4535

4636
_nvme_disconnect_subsys "${def_subsysnqn}"
4737

48-
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
49-
_remove_nvmet_subsystem "${def_subsysnqn}"
50-
_remove_nvmet_port "${port}"
51-
_remove_nvmet_host "${def_hostnqn}"
52-
53-
losetup -d "${loop_dev}"
54-
55-
rm "${def_file_path}"
38+
_nvmet_target_cleanup
5639

5740
echo "Test complete"
5841
}

‎tests/nvme/011‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,9 @@ test() {
2020

2121
_setup_nvmet
2222

23-
local port
2423
local nvmedev
2524

26-
truncate -s "${nvme_img_size}" "${def_file_path}"
27-
28-
_create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
29-
"${def_subsys_uuid}"
30-
port="$(_create_nvmet_port "${nvme_trtype}")"
31-
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
32-
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
25+
_nvmet_target_setup --blkdev file
3326

3427
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3528

@@ -42,12 +35,7 @@ test() {
4235

4336
_nvme_disconnect_subsys "${def_subsysnqn}"
4437

45-
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
46-
_remove_nvmet_subsystem "${def_subsysnqn}"
47-
_remove_nvmet_port "${port}"
48-
_remove_nvmet_host "${def_hostnqn}"
49-
50-
rm "${def_file_path}"
38+
_nvmet_target_cleanup
5139

5240
echo "Test complete"
5341
}

‎tests/nvme/012‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,9 @@ test() {
2424

2525
_setup_nvmet
2626

27-
local port
2827
local nvmedev
29-
local loop_dev
3028

31-
truncate -s "${nvme_img_size}" "${def_file_path}"
32-
33-
loop_dev="$(losetup -f --show "${def_file_path}")"
34-
35-
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
36-
"${def_subsys_uuid}"
37-
port="$(_create_nvmet_port "${nvme_trtype}")"
38-
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
39-
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
29+
_nvmet_target_setup
4030

4131
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
4232

@@ -48,14 +38,7 @@ test() {
4838

4939
_nvme_disconnect_subsys "${def_subsysnqn}"
5040

51-
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
52-
_remove_nvmet_subsystem "${def_subsysnqn}"
53-
_remove_nvmet_port "${port}"
54-
_remove_nvmet_host "${def_hostnqn}"
55-
56-
losetup -d "${loop_dev}"
57-
58-
rm "${def_file_path}"
41+
_nvmet_target_cleanup
5942

6043
echo "Test complete"
6144
}

0 commit comments

Comments
 (0)