Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: rename SpdkJSONRPC to Client #448

Merged
merged 2 commits into from
Oct 10, 2023
Merged

fix: rename SpdkJSONRPC to Client #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f69dc64
fix: rename SpdkJSONRPC to Client
glimchb Oct 9, 2023
7072917
fix: pass ctx to all Call funcs
glimchb Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func runGrpcServer(grpcPort int, spdkAddress string, tlsFiles string, store gokv
log.Panicf("failed to listen: %v", err)
}

jsonRPC := spdk.NewSpdkJSONRPC(spdkAddress)
jsonRPC := spdk.NewClient(spdkAddress)
frontendOpiMarvellServer := fe.NewServer(jsonRPC, store)
frontendOpiSpdkServer := frontend.NewServer(jsonRPC, store)
backendOpiSpdkServer := backend.NewServer(jsonRPC, store)
Expand Down
12 changes: 6 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require (
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
github.com/onsi/ginkgo/v2 v2.12.1
github.com/opiproject/gospdk v0.0.0-20231003165248-8edbef6eb841
github.com/opiproject/opi-api v0.0.0-20231005114927-ec55946e5197
github.com/opiproject/gospdk v0.0.0-20231010002529-a2e5546ab856
github.com/opiproject/opi-api v0.0.0-20231009064235-b166668c8a86
github.com/opiproject/opi-smbios-bridge v0.1.3-0.20231002193517-9e34badb6265
github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231007135056-df9fa5d7b614
github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231010125224-24f59929632e
github.com/opiproject/opi-strongswan-bridge v0.1.1
github.com/philippgille/gokv v0.6.0
github.com/philippgille/gokv/gomap v0.6.0
Expand Down Expand Up @@ -215,9 +215,9 @@ require (
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto v0.0.0-20231009173412-8bfb1ae86b6c // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231009173412-8bfb1ae86b6c // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
14 changes: 14 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,12 +440,18 @@ github.com/opiproject/gospdk v0.0.0-20230924031820-4b65d0851cb9 h1:DkqXBfcVaJEts
github.com/opiproject/gospdk v0.0.0-20230924031820-4b65d0851cb9/go.mod h1:rO2nM/OyY69zPLQO2mNX8+ckvyAd2TqV1vLLG7qEB74=
github.com/opiproject/gospdk v0.0.0-20231003165248-8edbef6eb841 h1:xfR6qBHRRsRunE6+yDX5s1BhFFMElJNGh0MOt0rjLsU=
github.com/opiproject/gospdk v0.0.0-20231003165248-8edbef6eb841/go.mod h1:mRMIpGIwz5uuUUaDhh6ceIYq20qR5OVtxE0/x5fprEA=
github.com/opiproject/gospdk v0.0.0-20231009130851-ff9bd6faf71a h1:8j6GXu13bFM3uEo30n1H3h1MmgncFhjQkqw0TWEEy00=
github.com/opiproject/gospdk v0.0.0-20231009130851-ff9bd6faf71a/go.mod h1:mRMIpGIwz5uuUUaDhh6ceIYq20qR5OVtxE0/x5fprEA=
github.com/opiproject/gospdk v0.0.0-20231010002529-a2e5546ab856 h1:6g5F0gWzBUblradIH0kLyOc0teyYq9Sdi07U1nAbs+A=
github.com/opiproject/gospdk v0.0.0-20231010002529-a2e5546ab856/go.mod h1:mRMIpGIwz5uuUUaDhh6ceIYq20qR5OVtxE0/x5fprEA=
github.com/opiproject/opi-api v0.0.0-20231002080217-fc749d07fdda h1:w/HTrqmBrXabdcc71ACkRQqavKDFvfPp0MqiGWKTGjw=
github.com/opiproject/opi-api v0.0.0-20231002080217-fc749d07fdda/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20231004104309-217649f4535f h1:TXLfuUmFwB7Zk8YKIzEfT/LQ2i5d+BW/BzjQgaBBOWM=
github.com/opiproject/opi-api v0.0.0-20231004104309-217649f4535f/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20231005114927-ec55946e5197 h1:3wsLOfvfaVcnhA3ehz4HkAoejop/rlLy0msWM2pA0zw=
github.com/opiproject/opi-api v0.0.0-20231005114927-ec55946e5197/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-api v0.0.0-20231009064235-b166668c8a86 h1:lHZuWCy8La/nSZr2IAnLbrNV6JHCmWS1IMlTM73mPVM=
github.com/opiproject/opi-api v0.0.0-20231009064235-b166668c8a86/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/opiproject/opi-smbios-bridge v0.1.3-0.20230930033102-4953908f3ea6 h1:0TCR2UmJcQTCCH1uK0LdZ6LcBycO3uUAnLwfBqs6rIM=
github.com/opiproject/opi-smbios-bridge v0.1.3-0.20230930033102-4953908f3ea6/go.mod h1:qWMKMtmpgqXDoV4T+VYY6w9vwreU2y14eY9y5pRpsW8=
github.com/opiproject/opi-smbios-bridge v0.1.3-0.20231002193517-9e34badb6265 h1:7yPIQIPhRB09+ni0ypQAKrzhvfDfphk+dXRVl9Pyuvk=
Expand All @@ -458,6 +464,8 @@ github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231007094833-d69cbf81897a h1:en
github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231007094833-d69cbf81897a/go.mod h1:INyfSuY7woo5F/d0YjN3EerzYvBhNVLXylIANfCdxd0=
github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231007135056-df9fa5d7b614 h1:OW5/l/D74kyOtyeqecLm7yLWb/SyPpsINH5zAvUluJ4=
github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231007135056-df9fa5d7b614/go.mod h1:KRkBGPdFmmY+JeZrHj5Aa/LnSN+MUuW3nVkb7Bd7Fu8=
github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231010125224-24f59929632e h1:NJEwCp0l2SR2cIhaCQw3A+NO9Nu8ygChRzJywhmynzc=
github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231010125224-24f59929632e/go.mod h1:kyhCIlm5xZxRzgOrOhmYyPLniSVg++fQ917VoTnSs5c=
github.com/opiproject/opi-strongswan-bridge v0.1.1 h1:Mz/8AtA0DD8O/H9jCsDw7wuVoWNiqgXICLsD10XWJ+g=
github.com/opiproject/opi-strongswan-bridge v0.1.1/go.mod h1:ek3r3zLa9nOfb2a7ybdMJvb5BSGU9I17Xo38UMXfE+k=
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=
Expand Down Expand Up @@ -1036,14 +1044,20 @@ google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb h1:XFBgcDwm7irdHTb
google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA+oRzP9k7cSwJlvDFiROO72uwD6i0=
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk=
google.golang.org/genproto v0.0.0-20231009173412-8bfb1ae86b6c h1:ml3TAUoIIzQUtX88s/icpXCFW9lV5VwsuIuS1htNjKY=
google.golang.org/genproto v0.0.0-20231009173412-8bfb1ae86b6c/go.mod h1:MugzuwC+GYOxyF0XUGQvsT97bOgWCV7MM1XMc5FZv8E=
google.golang.org/genproto/googleapis/api v0.0.0-20230911183012-2d3300fd4832 h1:4E7rZzBdR5LmiZx6n47Dg4AjH8JLhMQWywsYqvXNLcs=
google.golang.org/genproto/googleapis/api v0.0.0-20230911183012-2d3300fd4832/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU=
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0=
google.golang.org/genproto/googleapis/api v0.0.0-20231009173412-8bfb1ae86b6c h1:0RtEmmHjemvUXloH7+RuBSIw7n+GEHMOMY1CkGYnWq4=
google.golang.org/genproto/googleapis/api v0.0.0-20231009173412-8bfb1ae86b6c/go.mod h1:Wth13BrWMRN/G+guBLupKa6fslcWZv14R0ZKDRkNfY8=
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM=
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA=
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 h1:6GQBEOdGkX6MMTLT9V+TjtIRZCw9VPD5Z+yHY9wMgS0=
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY=
google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c h1:jHkCUWkseRf+W+edG5hMzr/Uh1xkDREY4caybAq4dpY=
google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
Expand Down
24 changes: 12 additions & 12 deletions pkg/frontend/nvme_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func sortNvmeControllers(controllers []*pb.NvmeController) {
}

// CreateNvmeController creates an Nvme controller
func (s *Server) CreateNvmeController(_ context.Context, in *pb.CreateNvmeControllerRequest) (*pb.NvmeController, error) {
func (s *Server) CreateNvmeController(ctx context.Context, in *pb.CreateNvmeControllerRequest) (*pb.NvmeController, error) {
// check input correctness
if err := s.validateCreateNvmeControllerRequest(in); err != nil {
return nil, err
Expand Down Expand Up @@ -78,7 +78,7 @@ func (s *Server) CreateNvmeController(_ context.Context, in *pb.CreateNvmeContro
Mqes: int(in.GetNvmeController().GetSpec().GetSqes()),
}
var result models.MrvlNvmSubsysCreateCtrlrResult
err := s.rpc.Call("mrvl_nvm_subsys_create_ctrlr", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_create_ctrlr", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -95,7 +95,7 @@ func (s *Server) CreateNvmeController(_ context.Context, in *pb.CreateNvmeContro
}

// DeleteNvmeController deletes an Nvme controller
func (s *Server) DeleteNvmeController(_ context.Context, in *pb.DeleteNvmeControllerRequest) (*emptypb.Empty, error) {
func (s *Server) DeleteNvmeController(ctx context.Context, in *pb.DeleteNvmeControllerRequest) (*emptypb.Empty, error) {
// check input correctness
if err := s.validateDeleteNvmeControllerRequest(in); err != nil {
return nil, err
Expand Down Expand Up @@ -123,7 +123,7 @@ func (s *Server) DeleteNvmeController(_ context.Context, in *pb.DeleteNvmeContro
Force: 1,
}
var result models.MrvlNvmSubsysRemoveCtrlrResult
err := s.rpc.Call("mrvl_nvm_subsys_remove_ctrlr", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_remove_ctrlr", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -137,7 +137,7 @@ func (s *Server) DeleteNvmeController(_ context.Context, in *pb.DeleteNvmeContro
}

// UpdateNvmeController updates an Nvme controller
func (s *Server) UpdateNvmeController(_ context.Context, in *pb.UpdateNvmeControllerRequest) (*pb.NvmeController, error) {
func (s *Server) UpdateNvmeController(ctx context.Context, in *pb.UpdateNvmeControllerRequest) (*pb.NvmeController, error) {
// check input correctness
if err := s.validateUpdateNvmeControllerRequest(in); err != nil {
return nil, err
Expand Down Expand Up @@ -180,7 +180,7 @@ func (s *Server) UpdateNvmeController(_ context.Context, in *pb.UpdateNvmeContro
Mqes: int(in.GetNvmeController().GetSpec().GetSqes()),
}
var result models.MrvlNvmSubsysCreateCtrlrResult
err := s.rpc.Call("mrvl_nvm_subsys_update_ctrlr", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_update_ctrlr", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -197,7 +197,7 @@ func (s *Server) UpdateNvmeController(_ context.Context, in *pb.UpdateNvmeContro
}

// ListNvmeControllers lists Nvme controllers
func (s *Server) ListNvmeControllers(_ context.Context, in *pb.ListNvmeControllersRequest) (*pb.ListNvmeControllersResponse, error) {
func (s *Server) ListNvmeControllers(ctx context.Context, in *pb.ListNvmeControllersRequest) (*pb.ListNvmeControllersResponse, error) {
// check required fields
if err := fieldbehavior.ValidateRequiredFields(in); err != nil {
return nil, err
Expand All @@ -216,7 +216,7 @@ func (s *Server) ListNvmeControllers(_ context.Context, in *pb.ListNvmeControlle
Subnqn: subsys.Spec.Nqn,
}
var result models.MrvlNvmSubsysGetCtrlrListResult
err := s.rpc.Call("mrvl_nvm_subsys_get_ctrlr_list", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_get_ctrlr_list", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -242,7 +242,7 @@ func (s *Server) ListNvmeControllers(_ context.Context, in *pb.ListNvmeControlle
}

// GetNvmeController gets an Nvme controller
func (s *Server) GetNvmeController(_ context.Context, in *pb.GetNvmeControllerRequest) (*pb.NvmeController, error) {
func (s *Server) GetNvmeController(ctx context.Context, in *pb.GetNvmeControllerRequest) (*pb.NvmeController, error) {
// check input correctness
if err := s.validateGetNvmeControllerRequest(in); err != nil {
return nil, err
Expand All @@ -266,7 +266,7 @@ func (s *Server) GetNvmeController(_ context.Context, in *pb.GetNvmeControllerRe
CtrlrID: int(*controller.Spec.NvmeControllerId),
}
var result models.MrvlNvmGetCtrlrInfoResult
err := s.rpc.Call("mrvl_nvm_ctrlr_get_info", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_ctrlr_get_info", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -280,7 +280,7 @@ func (s *Server) GetNvmeController(_ context.Context, in *pb.GetNvmeControllerRe
}

// StatsNvmeController gets an Nvme controller stats
func (s *Server) StatsNvmeController(_ context.Context, in *pb.StatsNvmeControllerRequest) (*pb.StatsNvmeControllerResponse, error) {
func (s *Server) StatsNvmeController(ctx context.Context, in *pb.StatsNvmeControllerRequest) (*pb.StatsNvmeControllerResponse, error) {
// check input correctness
if err := s.validateStatsNvmeControllerRequest(in); err != nil {
return nil, err
Expand All @@ -304,7 +304,7 @@ func (s *Server) StatsNvmeController(_ context.Context, in *pb.StatsNvmeControll
CtrlrID: int(*controller.Spec.NvmeControllerId),
}
var result models.MrvlNvmGetCtrlrStatsResult
err := s.rpc.Call("mrvl_nvm_get_ctrlr_stats", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_get_ctrlr_stats", &params, &result)
if err != nil {
return nil, err
}
Expand Down
24 changes: 12 additions & 12 deletions pkg/frontend/nvme_namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func sortNvmeNamespaces(namespaces []*pb.NvmeNamespace) {
}

// CreateNvmeNamespace creates an Nvme namespace
func (s *Server) CreateNvmeNamespace(_ context.Context, in *pb.CreateNvmeNamespaceRequest) (*pb.NvmeNamespace, error) {
func (s *Server) CreateNvmeNamespace(ctx context.Context, in *pb.CreateNvmeNamespaceRequest) (*pb.NvmeNamespace, error) {
// check input correctness
if err := s.validateCreateNvmeNamespaceRequest(in); err != nil {
return nil, err
Expand Down Expand Up @@ -70,7 +70,7 @@ func (s *Server) CreateNvmeNamespace(_ context.Context, in *pb.CreateNvmeNamespa
Bdev: in.NvmeNamespace.Spec.VolumeNameRef,
}
var result models.MrvlNvmSubsysAllocNsResult
err := s.rpc.Call("mrvl_nvm_subsys_alloc_ns", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_alloc_ns", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -90,7 +90,7 @@ func (s *Server) CreateNvmeNamespace(_ context.Context, in *pb.CreateNvmeNamespa
NsInstanceID: int(in.NvmeNamespace.Spec.HostNsid),
}
var result models.MrvlNvmCtrlrAttachNsResult
err := s.rpc.Call("mrvl_nvm_ctrlr_attach_ns", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_ctrlr_attach_ns", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -106,7 +106,7 @@ func (s *Server) CreateNvmeNamespace(_ context.Context, in *pb.CreateNvmeNamespa
}

// DeleteNvmeNamespace deletes an Nvme namespace
func (s *Server) DeleteNvmeNamespace(_ context.Context, in *pb.DeleteNvmeNamespaceRequest) (*emptypb.Empty, error) {
func (s *Server) DeleteNvmeNamespace(ctx context.Context, in *pb.DeleteNvmeNamespaceRequest) (*emptypb.Empty, error) {
// check input correctness
if err := s.validateDeleteNvmeNamespaceRequest(in); err != nil {
return nil, err
Expand Down Expand Up @@ -139,7 +139,7 @@ func (s *Server) DeleteNvmeNamespace(_ context.Context, in *pb.DeleteNvmeNamespa
NsInstanceID: int(namespace.Spec.HostNsid),
}
var result models.MrvlNvmCtrlrDetachNsResult
err := s.rpc.Call("mrvl_nvm_ctrlr_detach_ns", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_ctrlr_detach_ns", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -154,7 +154,7 @@ func (s *Server) DeleteNvmeNamespace(_ context.Context, in *pb.DeleteNvmeNamespa
NsInstanceID: int(namespace.Spec.HostNsid),
}
var result models.MrvlNvmSubsysUnallocNsResult
err := s.rpc.Call("mrvl_nvm_subsys_unalloc_ns", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_unalloc_ns", &params, &result)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -192,7 +192,7 @@ func (s *Server) UpdateNvmeNamespace(_ context.Context, in *pb.UpdateNvmeNamespa
}

// ListNvmeNamespaces lists Nvme namespaces
func (s *Server) ListNvmeNamespaces(_ context.Context, in *pb.ListNvmeNamespacesRequest) (*pb.ListNvmeNamespacesResponse, error) {
func (s *Server) ListNvmeNamespaces(ctx context.Context, in *pb.ListNvmeNamespacesRequest) (*pb.ListNvmeNamespacesResponse, error) {
// check required fields
if err := fieldbehavior.ValidateRequiredFields(in); err != nil {
return nil, err
Expand All @@ -211,7 +211,7 @@ func (s *Server) ListNvmeNamespaces(_ context.Context, in *pb.ListNvmeNamespaces
Subnqn: subsys.Spec.Nqn,
}
var result models.MrvlNvmSubsysGetNsListResult
err := s.rpc.Call("mrvl_nvm_subsys_get_ns_list", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_get_ns_list", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -237,7 +237,7 @@ func (s *Server) ListNvmeNamespaces(_ context.Context, in *pb.ListNvmeNamespaces
}

// GetNvmeNamespace gets an Nvme namespace
func (s *Server) GetNvmeNamespace(_ context.Context, in *pb.GetNvmeNamespaceRequest) (*pb.NvmeNamespace, error) {
func (s *Server) GetNvmeNamespace(ctx context.Context, in *pb.GetNvmeNamespaceRequest) (*pb.NvmeNamespace, error) {
// check input correctness
if err := s.validateGetNvmeNamespaceRequest(in); err != nil {
return nil, err
Expand All @@ -263,7 +263,7 @@ func (s *Server) GetNvmeNamespace(_ context.Context, in *pb.GetNvmeNamespaceRequ
NsInstanceID: int(namespace.Spec.HostNsid),
}
var result models.MrvlNvmGetNsInfoResult
err := s.rpc.Call("mrvl_nvm_ns_get_info", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_ns_get_info", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -276,7 +276,7 @@ func (s *Server) GetNvmeNamespace(_ context.Context, in *pb.GetNvmeNamespaceRequ
}

// StatsNvmeNamespace gets an Nvme namespace stats
func (s *Server) StatsNvmeNamespace(_ context.Context, in *pb.StatsNvmeNamespaceRequest) (*pb.StatsNvmeNamespaceResponse, error) {
func (s *Server) StatsNvmeNamespace(ctx context.Context, in *pb.StatsNvmeNamespaceRequest) (*pb.StatsNvmeNamespaceResponse, error) {
// check input correctness
if err := s.validateStatsNvmeNamespaceRequest(in); err != nil {
return nil, err
Expand All @@ -301,7 +301,7 @@ func (s *Server) StatsNvmeNamespace(_ context.Context, in *pb.StatsNvmeNamespace
NsInstanceID: int(namespace.Spec.HostNsid),
}
var result models.MrvlNvmGetNsStatsResult
err := s.rpc.Call("mrvl_nvm_get_ns_stats", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_get_ns_stats", &params, &result)
if err != nil {
return nil, err
}
Expand Down
Loading
Loading