From 743a9ddbd28a1944f4812a0ebe6b8dc4d4c2a146 Mon Sep 17 00:00:00 2001 From: Boris Glimcher Date: Mon, 9 Oct 2023 23:52:21 +0300 Subject: [PATCH] test: align to interface changes Signed-off-by: Boris Glimcher --- pkg/backend/nvme_path.go | 2 +- pkg/frontend/blk.go | 4 ++-- pkg/frontend/nvme_controller.go | 8 ++++---- pkg/frontend/nvme_namespace.go | 4 ++-- pkg/frontend/nvme_subsystem.go | 2 +- pkg/frontend/scsi.go | 8 ++++---- pkg/kvm/kvm_test.go | 8 ++++++-- pkg/middleend/qos.go | 4 ++-- pkg/middleend/qos_test.go | 8 ++++++-- 9 files changed, 28 insertions(+), 20 deletions(-) diff --git a/pkg/backend/nvme_path.go b/pkg/backend/nvme_path.go index 3053fef6..e2bceb8d 100644 --- a/pkg/backend/nvme_path.go +++ b/pkg/backend/nvme_path.go @@ -155,7 +155,7 @@ func (s *Server) DeleteNvmePath(ctx context.Context, in *pb.DeleteNvmePathReques } // UpdateNvmePath updates an Nvme path -func (s *Server) UpdateNvmePath(ctx context.Context, in *pb.UpdateNvmePathRequest) (*pb.NvmePath, error) { +func (s *Server) UpdateNvmePath(_ context.Context, in *pb.UpdateNvmePathRequest) (*pb.NvmePath, error) { // check input correctness if err := s.validateUpdateNvmePathRequest(in); err != nil { return nil, err diff --git a/pkg/frontend/blk.go b/pkg/frontend/blk.go index f80c689c..10b1f0ff 100644 --- a/pkg/frontend/blk.go +++ b/pkg/frontend/blk.go @@ -111,7 +111,7 @@ func (s *Server) DeleteVirtioBlk(ctx context.Context, in *pb.DeleteVirtioBlkRequ } // UpdateVirtioBlk updates a Virtio block device -func (s *Server) UpdateVirtioBlk(ctx context.Context, in *pb.UpdateVirtioBlkRequest) (*pb.VirtioBlk, error) { +func (s *Server) UpdateVirtioBlk(_ context.Context, in *pb.UpdateVirtioBlkRequest) (*pb.VirtioBlk, error) { // check input correctness if err := s.validateUpdateVirtioBlkRequest(in); err != nil { return nil, err @@ -212,7 +212,7 @@ func (s *Server) GetVirtioBlk(ctx context.Context, in *pb.GetVirtioBlkRequest) ( } // StatsVirtioBlk gets a Virtio block device stats -func (s *Server) StatsVirtioBlk(ctx context.Context, in *pb.StatsVirtioBlkRequest) (*pb.StatsVirtioBlkResponse, error) { +func (s *Server) StatsVirtioBlk(_ context.Context, in *pb.StatsVirtioBlkRequest) (*pb.StatsVirtioBlkResponse, error) { log.Printf("StatsVirtioBlk: Received from client: %v", in) // check input correctness if err := s.validateStatsVirtioBlkRequest(in); err != nil { diff --git a/pkg/frontend/nvme_controller.go b/pkg/frontend/nvme_controller.go index e17141a9..32bdce70 100644 --- a/pkg/frontend/nvme_controller.go +++ b/pkg/frontend/nvme_controller.go @@ -138,7 +138,7 @@ func (s *Server) DeleteNvmeController(ctx context.Context, in *pb.DeleteNvmeCont } // UpdateNvmeController updates an Nvme controller -func (s *Server) UpdateNvmeController(ctx context.Context, in *pb.UpdateNvmeControllerRequest) (*pb.NvmeController, error) { +func (s *Server) UpdateNvmeController(_ context.Context, in *pb.UpdateNvmeControllerRequest) (*pb.NvmeController, error) { // check input correctness if err := s.validateUpdateNvmeControllerRequest(in); err != nil { return nil, err @@ -165,7 +165,7 @@ func (s *Server) UpdateNvmeController(ctx context.Context, in *pb.UpdateNvmeCont } // ListNvmeControllers lists Nvme controllers -func (s *Server) ListNvmeControllers(ctx context.Context, in *pb.ListNvmeControllersRequest) (*pb.ListNvmeControllersResponse, error) { +func (s *Server) ListNvmeControllers(_ context.Context, in *pb.ListNvmeControllersRequest) (*pb.ListNvmeControllersResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -182,7 +182,7 @@ func (s *Server) ListNvmeControllers(ctx context.Context, in *pb.ListNvmeControl } // GetNvmeController gets an Nvme controller -func (s *Server) GetNvmeController(ctx context.Context, in *pb.GetNvmeControllerRequest) (*pb.NvmeController, error) { +func (s *Server) GetNvmeController(_ context.Context, in *pb.GetNvmeControllerRequest) (*pb.NvmeController, error) { // check input correctness if err := s.validateGetNvmeControllerRequest(in); err != nil { return nil, err @@ -197,7 +197,7 @@ func (s *Server) GetNvmeController(ctx context.Context, in *pb.GetNvmeController } // StatsNvmeController gets an Nvme controller stats -func (s *Server) StatsNvmeController(ctx context.Context, in *pb.StatsNvmeControllerRequest) (*pb.StatsNvmeControllerResponse, error) { +func (s *Server) StatsNvmeController(_ context.Context, in *pb.StatsNvmeControllerRequest) (*pb.StatsNvmeControllerResponse, error) { // check input correctness if err := s.validateStatsNvmeControllerRequest(in); err != nil { return nil, err diff --git a/pkg/frontend/nvme_namespace.go b/pkg/frontend/nvme_namespace.go index 7db582b0..31d5e312 100644 --- a/pkg/frontend/nvme_namespace.go +++ b/pkg/frontend/nvme_namespace.go @@ -125,7 +125,7 @@ func (s *Server) DeleteNvmeNamespace(ctx context.Context, in *pb.DeleteNvmeNames } // UpdateNvmeNamespace updates an Nvme namespace -func (s *Server) UpdateNvmeNamespace(ctx context.Context, in *pb.UpdateNvmeNamespaceRequest) (*pb.NvmeNamespace, error) { +func (s *Server) UpdateNvmeNamespace(_ context.Context, in *pb.UpdateNvmeNamespaceRequest) (*pb.NvmeNamespace, error) { // check input correctness if err := s.validateUpdateNvmeNamespaceRequest(in); err != nil { return nil, err @@ -255,7 +255,7 @@ func (s *Server) GetNvmeNamespace(ctx context.Context, in *pb.GetNvmeNamespaceRe } // StatsNvmeNamespace gets an Nvme namespace stats -func (s *Server) StatsNvmeNamespace(ctx context.Context, in *pb.StatsNvmeNamespaceRequest) (*pb.StatsNvmeNamespaceResponse, error) { +func (s *Server) StatsNvmeNamespace(_ context.Context, in *pb.StatsNvmeNamespaceRequest) (*pb.StatsNvmeNamespaceResponse, error) { // check input correctness if err := s.validateStatsNvmeNamespaceRequest(in); err != nil { return nil, err diff --git a/pkg/frontend/nvme_subsystem.go b/pkg/frontend/nvme_subsystem.go index c144d83b..a0d0fe5e 100644 --- a/pkg/frontend/nvme_subsystem.go +++ b/pkg/frontend/nvme_subsystem.go @@ -154,7 +154,7 @@ func (s *Server) DeleteNvmeSubsystem(ctx context.Context, in *pb.DeleteNvmeSubsy } // UpdateNvmeSubsystem updates an Nvme Subsystem -func (s *Server) UpdateNvmeSubsystem(ctx context.Context, in *pb.UpdateNvmeSubsystemRequest) (*pb.NvmeSubsystem, error) { +func (s *Server) UpdateNvmeSubsystem(_ context.Context, in *pb.UpdateNvmeSubsystemRequest) (*pb.NvmeSubsystem, error) { // check input correctness if err := s.validateUpdateNvmeSubsystemRequest(in); err != nil { return nil, err diff --git a/pkg/frontend/scsi.go b/pkg/frontend/scsi.go index ec513c00..41f8c62e 100644 --- a/pkg/frontend/scsi.go +++ b/pkg/frontend/scsi.go @@ -112,7 +112,7 @@ func (s *Server) DeleteVirtioScsiController(ctx context.Context, in *pb.DeleteVi } // UpdateVirtioScsiController updates a Virtio SCSI controller -func (s *Server) UpdateVirtioScsiController(ctx context.Context, in *pb.UpdateVirtioScsiControllerRequest) (*pb.VirtioScsiController, error) { +func (s *Server) UpdateVirtioScsiController(_ context.Context, in *pb.UpdateVirtioScsiControllerRequest) (*pb.VirtioScsiController, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -206,7 +206,7 @@ func (s *Server) GetVirtioScsiController(ctx context.Context, in *pb.GetVirtioSc } // StatsVirtioScsiController gets a Virtio SCSI controller stats -func (s *Server) StatsVirtioScsiController(ctx context.Context, in *pb.StatsVirtioScsiControllerRequest) (*pb.StatsVirtioScsiControllerResponse, error) { +func (s *Server) StatsVirtioScsiController(_ context.Context, in *pb.StatsVirtioScsiControllerRequest) (*pb.StatsVirtioScsiControllerResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -317,7 +317,7 @@ func (s *Server) DeleteVirtioScsiLun(ctx context.Context, in *pb.DeleteVirtioScs } // UpdateVirtioScsiLun updates a Virtio SCSI LUN -func (s *Server) UpdateVirtioScsiLun(ctx context.Context, in *pb.UpdateVirtioScsiLunRequest) (*pb.VirtioScsiLun, error) { +func (s *Server) UpdateVirtioScsiLun(_ context.Context, in *pb.UpdateVirtioScsiLunRequest) (*pb.VirtioScsiLun, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -412,7 +412,7 @@ func (s *Server) GetVirtioScsiLun(ctx context.Context, in *pb.GetVirtioScsiLunRe } // StatsVirtioScsiLun gets a Virtio SCSI LUN stats -func (s *Server) StatsVirtioScsiLun(ctx context.Context, in *pb.StatsVirtioScsiLunRequest) (*pb.StatsVirtioScsiLunResponse, error) { +func (s *Server) StatsVirtioScsiLun(_ context.Context, in *pb.StatsVirtioScsiLunRequest) (*pb.StatsVirtioScsiLunResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err diff --git a/pkg/kvm/kvm_test.go b/pkg/kvm/kvm_test.go index bcfd8ffc..d2d41563 100644 --- a/pkg/kvm/kvm_test.go +++ b/pkg/kvm/kvm_test.go @@ -5,6 +5,7 @@ package kvm import ( + "context" "fmt" "log" "net" @@ -48,6 +49,9 @@ type stubJSONRRPC struct { err error } +// build time check that struct implements interface +var _ spdk.JSONRPC = (*stubJSONRRPC)(nil) + func (s stubJSONRRPC) GetID() uint64 { return 0 } @@ -56,11 +60,11 @@ func (s stubJSONRRPC) StartUnixListener() net.Listener { return nil } -func (s stubJSONRRPC) GetVersion() string { +func (s stubJSONRRPC) GetVersion(_ context.Context) string { return "" } -func (s stubJSONRRPC) Call(method string, _, result interface{}) error { +func (s stubJSONRRPC) Call(_ context.Context, method string, _, result interface{}) error { if method == "vhost_create_blk_controller" { if s.err == nil { resultCreateVirtioBLk, ok := result.(*spdk.VhostCreateBlkControllerResult) diff --git a/pkg/middleend/qos.go b/pkg/middleend/qos.go index b53d312a..9f677d97 100644 --- a/pkg/middleend/qos.go +++ b/pkg/middleend/qos.go @@ -116,7 +116,7 @@ func (s *Server) UpdateQosVolume(ctx context.Context, in *pb.UpdateQosVolumeRequ } // ListQosVolumes lists QoS volumes -func (s *Server) ListQosVolumes(ctx context.Context, in *pb.ListQosVolumesRequest) (*pb.ListQosVolumesResponse, error) { +func (s *Server) ListQosVolumes(_ context.Context, in *pb.ListQosVolumesRequest) (*pb.ListQosVolumesResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -145,7 +145,7 @@ func (s *Server) ListQosVolumes(ctx context.Context, in *pb.ListQosVolumesReques } // GetQosVolume gets a QoS volume -func (s *Server) GetQosVolume(ctx context.Context, in *pb.GetQosVolumeRequest) (*pb.QosVolume, error) { +func (s *Server) GetQosVolume(_ context.Context, in *pb.GetQosVolumeRequest) (*pb.QosVolume, error) { // check input correctness if err := s.validateGetQosVolumeRequest(in); err != nil { return nil, err diff --git a/pkg/middleend/qos_test.go b/pkg/middleend/qos_test.go index b1fa7013..7bb87757 100644 --- a/pkg/middleend/qos_test.go +++ b/pkg/middleend/qos_test.go @@ -5,6 +5,7 @@ package middleend import ( + "context" "fmt" "net" "testing" @@ -33,6 +34,9 @@ type stubJSONRRPC struct { params []any } +// build time check that struct implements interface +var _ spdk.JSONRPC = (*stubJSONRRPC)(nil) + func (s *stubJSONRRPC) GetID() uint64 { return 0 } @@ -41,11 +45,11 @@ func (s *stubJSONRRPC) StartUnixListener() net.Listener { return nil } -func (s *stubJSONRRPC) GetVersion() string { +func (s *stubJSONRRPC) GetVersion(_ context.Context) string { return "" } -func (s *stubJSONRRPC) Call(_ string, param interface{}, _ interface{}) error { +func (s *stubJSONRRPC) Call(_ context.Context, _ string, param interface{}, _ interface{}) error { s.params = append(s.params, param) return nil }