test: align to interface changes

Signed-off-by: Boris Glimcher <[email protected]>
opiproject · Oct 9, 2023 · 120a051 · 120a051
1 parent a3b9b68
commit 120a051
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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

diff --git 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

diff --git 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
@@ -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

diff --git 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
@@ -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
@@ -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
 }