ci: add support for TLS connection

Signed-off-by: Boris Glimcher <[email protected]>
opiproject · Jun 13, 2023 · 5f2a009 · 5f2a009
1 parent 0ca0aef
commit 5f2a009
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/pkg/backend/nvme.go b/pkg/backend/nvme.go
@@ -68,6 +68,7 @@ func (s *Server) CreateNVMfRemoteController(_ context.Context, in *pb.CreateNVMf
 		Hostnqn: in.NvMfRemoteController.Hostnqn,
 		Hdgst:   in.NvMfRemoteController.Hdgst,
 		Ddgst:   in.NvMfRemoteController.Ddgst,
+		Psk:     "/tmp/opikey.txt",
 	}
 	var result []spdk.BdevNvmeAttachControllerResult
 	err := s.rpc.Call("bdev_nvme_attach_controller", &params, &result)

diff --git a/pkg/frontend/nvme_controller.go b/pkg/frontend/nvme_controller.go
@@ -80,6 +80,7 @@ func (c *tcpSubsystemListener) Params(_ *pb.NvmeController, nqn string) spdk.Nvm
 	result.ListenAddress.Traddr = c.listenAddr.String()
 	result.ListenAddress.Trsvcid = c.listenPort
 	result.ListenAddress.Adrfam = c.protocol
+	result.SecureChannel = true
 
 	return result
 }

diff --git a/pkg/frontend/nvme_subsystem.go b/pkg/frontend/nvme_subsystem.go
@@ -70,7 +70,7 @@ func (s *Server) CreateNvmeSubsystem(_ context.Context, in *pb.CreateNvmeSubsyst
 		Nqn:           in.NvmeSubsystem.Spec.Nqn,
 		SerialNumber:  in.NvmeSubsystem.Spec.SerialNumber,
 		ModelNumber:   in.NvmeSubsystem.Spec.ModelNumber,
-		AllowAnyHost:  true,
+		AllowAnyHost:  false,
 		MaxNamespaces: int(in.NvmeSubsystem.Spec.MaxNamespaces),
 	}
 	var result spdk.NvmfCreateSubsystemResult

diff --git a/scripts/tests.sh b/scripts/tests.sh
@@ -62,6 +62,8 @@ grep "Total" log.txt
 docker run --rm --network=host --privileged -v /dev/hugepages:/dev/hugepages ghcr.io/opiproject/spdk:main spdk_nvme_identify -r 'traddr:127.0.0.1 trtype:TCP adrfam:IPv4 trsvcid:4444'
 docker run --rm --network=host --privileged -v /dev/hugepages:/dev/hugepages ghcr.io/opiproject/spdk:main spdk_nvme_perf     -r 'traddr:127.0.0.1 trtype:TCP adrfam:IPv4 trsvcid:4444 subnqn:nqn.2022-09.io.spdk:opitest1 hostnqn:nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c' -c 0x1 -q 1 -o 4096 -w randread -t 10 | tee log.txt
 grep "Total" log.txt
+docker run --rm --network=host --privileged -v /dev/hugepages:/dev/hugepages ghcr.io/opiproject/spdk:main spdk_nvme_perf     -r 'traddr:127.0.0.1 trtype:TCP adrfam:IPv4 trsvcid:5555 subnqn:nqn.2022-09.io.spdk:opitest1 hostnqn:nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c' -c 0x1 -q 1 -o 4096 -w randread -t 10 --psk-path /tmp/opikey.txt | tee log.txt
+grep "Total" log.txt
 "${grpc_cli[@]}" call --json_input --json_output opi-spdk-server:50051 DeleteNvmeNamespace "{name : '//storage.opiproject.org/volumes/namespace1'}"
 "${grpc_cli[@]}" call --json_input --json_output opi-spdk-server:50051 DeleteNvmeController "{name : '//storage.opiproject.org/volumes/controller1'}"
 "${grpc_cli[@]}" call --json_input --json_output opi-spdk-server:50051 DeleteNvmeSubsystem "{name : '//storage.opiproject.org/volumes/subsystem1'}"