diff --git a/go.mod b/go.mod index afa997a6..a8760b68 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/digitalocean/go-qemu v0.0.0-20221209210016-f035778c97f7 github.com/google/uuid v1.3.0 - github.com/opiproject/gospdk v0.0.0-20230515120524-37c85998ff39 + github.com/opiproject/gospdk v0.0.0-20230601215713-d912b55f1d0a github.com/opiproject/opi-api v0.0.0-20230531200807-4aa6c73d421b google.golang.org/grpc v1.55.0 google.golang.org/protobuf v1.30.0 diff --git a/go.sum b/go.sum index d18c5d41..5475e879 100644 --- a/go.sum +++ b/go.sum @@ -13,6 +13,8 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/opiproject/gospdk v0.0.0-20230515120524-37c85998ff39 h1:PS5lPK4scy8AUY3UTa2rnCXRN/9ExHWldf1Gaqk0+7E= github.com/opiproject/gospdk v0.0.0-20230515120524-37c85998ff39/go.mod h1:Unf3idtaelGKnTbIbJ+oKsxrBOFdVdFlDnwUKKVSxPQ= +github.com/opiproject/gospdk v0.0.0-20230601215713-d912b55f1d0a h1:Bap/OuTiR/OqSWCyntyFmVKPPSbKTaulKD/QdPJ5ojs= +github.com/opiproject/gospdk v0.0.0-20230601215713-d912b55f1d0a/go.mod h1:Unf3idtaelGKnTbIbJ+oKsxrBOFdVdFlDnwUKKVSxPQ= github.com/opiproject/opi-api v0.0.0-20230531200807-4aa6c73d421b h1:+W/+F5eDs5ZKyg+2dCvu6KI7FEXFcptwMvuBAPuWLUY= github.com/opiproject/opi-api v0.0.0-20230531200807-4aa6c73d421b/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/pkg/backend/nvme.go b/pkg/backend/nvme.go index 16f26e59..9582b5e5 100644 --- a/pkg/backend/nvme.go +++ b/pkg/backend/nvme.go @@ -56,6 +56,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", ¶ms, &result) diff --git a/pkg/frontend/nvme.go b/pkg/frontend/nvme.go index fcec7679..6d5d41d3 100644 --- a/pkg/frontend/nvme.go +++ b/pkg/frontend/nvme.go @@ -89,6 +89,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 } @@ -114,7 +115,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 806a13af..567e81df 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 : 'namespace1'}" "${grpc_cli[@]}" call --json_input --json_output opi-spdk-server:50051 DeleteNvmeController "{name : 'controller1'}" "${grpc_cli[@]}" call --json_input --json_output opi-spdk-server:50051 DeleteNvmeSubsystem "{name : 'subsystem1'}"