From 6c2e32f969cf475526297e531f5f133f170531a3 Mon Sep 17 00:00:00 2001 From: Boris Glimcher Date: Wed, 31 May 2023 02:28:20 +0300 Subject: [PATCH] ci: add support for TLS connection Signed-off-by: Boris Glimcher --- pkg/backend/nvme_path.go | 1 + pkg/frontend/nvme_controller.go | 1 + pkg/frontend/nvme_subsystem.go | 2 +- scripts/tests.sh | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/backend/nvme_path.go b/pkg/backend/nvme_path.go index cf9e4b28..86a1eef7 100644 --- a/pkg/backend/nvme_path.go +++ b/pkg/backend/nvme_path.go @@ -82,6 +82,7 @@ func (s *Server) CreateNvmePath(_ context.Context, in *pb.CreateNvmePathRequest) Multipath: multipath, Hdgst: controller.Hdgst, Ddgst: controller.Ddgst, + Psk: "/tmp/opikey.txt", } var result []spdk.BdevNvmeAttachControllerResult err := s.rpc.Call("bdev_nvme_attach_controller", ¶ms, &result) diff --git a/pkg/frontend/nvme_controller.go b/pkg/frontend/nvme_controller.go index 778b24df..e9374072 100644 --- a/pkg/frontend/nvme_controller.go +++ b/pkg/frontend/nvme_controller.go @@ -81,6 +81,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 index 1f2a9aaf..2fc8670d 100644 --- a/pkg/frontend/nvme_subsystem.go +++ b/pkg/frontend/nvme_subsystem.go @@ -71,7 +71,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 index fe27d7bb..a606c55c 100755 --- 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'}"