Skip to content

Commit 2866494

Browse files
dwsusekawasaki
dwsuse
authored and
kawasaki
committed
nvme: Add explicitly host to allow_host list
Only allow to connect to our setup target with the correct hostnqn. Thus we have to explicitly add the test hostnqn to the test subsysnqn allow_host list. In nvme/030 the genctr is updated as side effect by writing the attr_allow_any_host variable. Though writting to attr_allow_any_host is not allowed after switching to the allow_host list. We can achieve the same effect by adding and removing the host to the allow_host list. Signed-off-by: Daniel Wagner <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Signed-off-by: Shin'ichiro Kawasaki <[email protected]>
1 parent c32b233 commit 2866494

26 files changed

Lines changed: 61 additions & 8 deletions

File tree

‎tests/nvme/004‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ test() {
3434
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3535
"${def_subsys_uuid}"
3636
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
37+
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
3738

3839
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3940

@@ -46,6 +47,7 @@ test() {
4647
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
4748
_remove_nvmet_subsystem "${def_subsysnqn}"
4849
_remove_nvmet_port "${port}"
50+
_remove_nvmet_host "${def_hostnqn}"
4951
losetup -d "$loop_dev"
5052
rm "${def_file_path}"
5153

‎tests/nvme/005‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ test() {
3434
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3535
"${def_subsys_uuid}"
3636
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
37+
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
3738

3839
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3940

@@ -46,8 +47,9 @@ test() {
4647
_nvme_disconnect_ctrl "${nvmedev}"
4748
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
4849
_remove_nvmet_port "${port}"
49-
5050
_remove_nvmet_subsystem "${def_subsysnqn}"
51+
_remove_nvmet_host "${def_hostnqn}"
52+
5153
losetup -d "$loop_dev"
5254
rm "${def_file_path}"
5355

‎tests/nvme/008‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ test() {
3232
"${def_subsys_uuid}"
3333
port="$(_create_nvmet_port "${nvme_trtype}")"
3434
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
35+
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
3536

3637
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3738

@@ -46,6 +47,7 @@ test() {
4647
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
4748
_remove_nvmet_subsystem "${def_subsysnqn}"
4849
_remove_nvmet_port "${port}"
50+
_remove_nvmet_host "${def_hostnqn}"
4951

5052
losetup -d "${loop_dev}"
5153

‎tests/nvme/009‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ test() {
2828
"${def_subsys_uuid}"
2929
port="$(_create_nvmet_port "${nvme_trtype}")"
3030
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
31+
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
3132

3233
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3334

@@ -42,6 +43,7 @@ test() {
4243
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
4344
_remove_nvmet_subsystem "${def_subsysnqn}"
4445
_remove_nvmet_port "${port}"
46+
_remove_nvmet_host "${def_hostnqn}"
4547

4648
rm "${def_file_path}"
4749

‎tests/nvme/010‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ test() {
3232
"${def_subsys_uuid}"
3333
port="$(_create_nvmet_port "${nvme_trtype}")"
3434
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
35+
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
3536

3637
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3738

@@ -47,6 +48,7 @@ test() {
4748
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
4849
_remove_nvmet_subsystem "${def_subsysnqn}"
4950
_remove_nvmet_port "${port}"
51+
_remove_nvmet_host "${def_hostnqn}"
5052

5153
losetup -d "${loop_dev}"
5254

‎tests/nvme/011‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ test() {
2929
"${def_subsys_uuid}"
3030
port="$(_create_nvmet_port "${nvme_trtype}")"
3131
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
32+
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
3233

3334
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3435

@@ -44,6 +45,7 @@ test() {
4445
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
4546
_remove_nvmet_subsystem "${def_subsysnqn}"
4647
_remove_nvmet_port "${port}"
48+
_remove_nvmet_host "${def_hostnqn}"
4749

4850
rm "${def_file_path}"
4951

‎tests/nvme/012‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ test() {
3636
"${def_subsys_uuid}"
3737
port="$(_create_nvmet_port "${nvme_trtype}")"
3838
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
39+
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
3940

4041
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
4142

@@ -50,6 +51,7 @@ test() {
5051
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
5152
_remove_nvmet_subsystem "${def_subsysnqn}"
5253
_remove_nvmet_port "${port}"
54+
_remove_nvmet_host "${def_hostnqn}"
5355

5456
losetup -d "${loop_dev}"
5557

‎tests/nvme/013‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ test() {
3232
"${def_subsys_uuid}"
3333
port="$(_create_nvmet_port "${nvme_trtype}")"
3434
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
35+
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
3536

3637
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3738

@@ -46,6 +47,7 @@ test() {
4647
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
4748
_remove_nvmet_subsystem "${def_subsysnqn}"
4849
_remove_nvmet_port "${port}"
50+
_remove_nvmet_host "${def_hostnqn}"
4951

5052
rm "${def_file_path}"
5153

‎tests/nvme/014‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ test() {
3535
"${def_subsys_uuid}"
3636
port="$(_create_nvmet_port "${nvme_trtype}")"
3737
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
38+
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
3839

3940
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
4041

@@ -56,6 +57,7 @@ test() {
5657
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
5758
_remove_nvmet_subsystem "${def_subsysnqn}"
5859
_remove_nvmet_port "${port}"
60+
_remove_nvmet_host "${def_hostnqn}"
5961

6062
losetup -d "${loop_dev}"
6163

‎tests/nvme/015‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ test() {
3232
"${def_subsys_uuid}"
3333
port="$(_create_nvmet_port "${nvme_trtype}")"
3434
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
35+
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
3536

3637
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
3738

@@ -53,6 +54,7 @@ test() {
5354
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"
5455
_remove_nvmet_subsystem "${def_subsysnqn}"
5556
_remove_nvmet_port "${port}"
57+
_remove_nvmet_host "${def_hostnqn}"
5658

5759
rm "${def_file_path}"
5860

0 commit comments

Comments
 (0)