Skip to content
New issue

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

#

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

Already on GitHub? # to your account

tests: implement FrontEnd NVMe #89

Merged
merged 1 commit into from
Jan 10, 2023
Merged

tests: implement FrontEnd NVMe #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ issues:
# Default value for this option is true.
exclude-use-default: false

exclude-rules:
- path: (.+)_test.go
linters:
- funlen
- gocritic
- gocognit

# Maximum issues count per one linter. Set to 0 to disable. Default is 50.
max-issues-per-linter: 0

Expand Down
66 changes: 52 additions & 14 deletions server/frontend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ func (s *server) CreateNVMeSubsystem(ctx context.Context, in *pb.CreateNVMeSubsy
return nil, err
}
log.Printf("Received from SPDK: %v", result)
if !result {
msg := fmt.Sprintf("Could not create NQN: %s", in.NvMeSubsystem.Spec.Nqn)
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
var ver GetVersionResult
err = call("spdk_get_version", nil, &ver)
if err != nil {
Expand Down Expand Up @@ -73,7 +78,9 @@ func (s *server) DeleteNVMeSubsystem(ctx context.Context, in *pb.DeleteNVMeSubsy
}
log.Printf("Received from SPDK: %v", result)
if !result {
log.Printf("Could not delete: %v", in)
msg := fmt.Sprintf("Could not delete NQN: %s", subsys.Spec.Nqn)
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
delete(subsystems, subsys.Spec.Id.Value)
return &emptypb.Empty{}, nil
Expand All @@ -88,6 +95,7 @@ func (s *server) UpdateNVMeSubsystem(ctx context.Context, in *pb.UpdateNVMeSubsy
log.Printf("error: %v", err)
return nil, err
}
response.Status = &pb.NVMeSubsystemStatus{FirmwareRevision: "TBD"}
return response, nil
}

Expand All @@ -103,7 +111,7 @@ func (s *server) ListNVMeSubsystems(ctx context.Context, in *pb.ListNVMeSubsyste
Blobarray := make([]*pb.NVMeSubsystem, len(result))
for i := range result {
r := &result[i]
Blobarray[i] = &pb.NVMeSubsystem{Spec: &pb.NVMeSubsystemSpec{Nqn: r.Nqn}}
Blobarray[i] = &pb.NVMeSubsystem{Spec: &pb.NVMeSubsystemSpec{Nqn: r.Nqn, SerialNumber: r.SerialNumber, ModelNumber: r.ModelNumber}}
}
return &pb.ListNVMeSubsystemsResponse{NvMeSubsystems: Blobarray}, nil
}
Expand All @@ -128,7 +136,7 @@ func (s *server) GetNVMeSubsystem(ctx context.Context, in *pb.GetNVMeSubsystemRe
for i := range result {
r := &result[i]
if r.Nqn == subsys.Spec.Nqn {
return &pb.NVMeSubsystem{Spec: &pb.NVMeSubsystemSpec{Nqn: r.Nqn}}, nil
return &pb.NVMeSubsystem{Spec: &pb.NVMeSubsystemSpec{Nqn: r.Nqn, SerialNumber: r.SerialNumber, ModelNumber: r.ModelNumber}, Status: &pb.NVMeSubsystemStatus{FirmwareRevision: "TBD"}}, nil
}
}
msg := fmt.Sprintf("Could not find NQN: %s", subsys.Spec.Nqn)
Expand All @@ -145,7 +153,7 @@ func (s *server) NVMeSubsystemStats(ctx context.Context, in *pb.NVMeSubsystemSta
return nil, err
}
log.Printf("Received from SPDK: %v", result)
return &pb.NVMeSubsystemStatsResponse{Stats: &pb.VolumeStats{}}, nil
return &pb.NVMeSubsystemStatsResponse{Stats: &pb.VolumeStats{ReadOpsCount: -1, WriteOpsCount: -1}}, nil
}

// ////////////////////////////////////////////////////////
Expand Down Expand Up @@ -181,8 +189,16 @@ func (s *server) CreateNVMeController(ctx context.Context, in *pb.CreateNVMeCont
log.Printf("error: %v", err)
return nil, err
}
log.Printf("Received from SPDK: %v", result)
if !result {
msg := fmt.Sprintf("Could not create CTRL: %s", in.NvMeController.Spec.Id.Value)
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
controllers[in.NvMeController.Spec.Id.Value] = in.NvMeController
response := &pb.NVMeController{}
controllers[in.NvMeController.Spec.Id.Value].Spec.NvmeControllerId = -1
controllers[in.NvMeController.Spec.Id.Value].Status = &pb.NVMeControllerStatus{Active: true}
response := &pb.NVMeController{Spec: &pb.NVMeControllerSpec{Id: &pc.ObjectKey{Value: "TBD"}}}
err = deepcopier.Copy(in.NvMeController).To(response)
if err != nil {
log.Printf("error: %v", err)
Expand Down Expand Up @@ -226,13 +242,20 @@ func (s *server) DeleteNVMeController(ctx context.Context, in *pb.DeleteNVMeCont
log.Printf("error: %v", err)
return nil, err
}
log.Printf("Received from SPDK: %v", result)
if !result {
msg := fmt.Sprintf("Could not delete NQN:ID %s:%d", subsys.Spec.Nqn, controller.Spec.NvmeControllerId)
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
delete(controllers, controller.Spec.Id.Value)
return &emptypb.Empty{}, nil
}

func (s *server) UpdateNVMeController(ctx context.Context, in *pb.UpdateNVMeControllerRequest) (*pb.NVMeController, error) {
log.Printf("Received from client: %v", in.NvMeController)
log.Printf("UpdateNVMeController: Received from client: %v", in)
controllers[in.NvMeController.Spec.Id.Value] = in.NvMeController
controllers[in.NvMeController.Spec.Id.Value].Status = &pb.NVMeControllerStatus{Active: true}
response := &pb.NVMeController{}
err := deepcopier.Copy(in.NvMeController).To(response)
if err != nil {
Expand All @@ -257,12 +280,12 @@ func (s *server) GetNVMeController(ctx context.Context, in *pb.GetNVMeController
if !ok {
return nil, fmt.Errorf("error finding controller %s", in.Name)
}
return &pb.NVMeController{Spec: &pb.NVMeControllerSpec{Id: &pc.ObjectKey{Value: in.Name}, NvmeControllerId: controller.Spec.NvmeControllerId}}, nil
return &pb.NVMeController{Spec: &pb.NVMeControllerSpec{Id: &pc.ObjectKey{Value: in.Name}, NvmeControllerId: controller.Spec.NvmeControllerId}, Status: &pb.NVMeControllerStatus{Active: true}}, nil
}

func (s *server) NVMeControllerStats(ctx context.Context, in *pb.NVMeControllerStatsRequest) (*pb.NVMeControllerStatsResponse, error) {
log.Printf("Received from client: %v", in.Id)
return &pb.NVMeControllerStatsResponse{}, nil
log.Printf("NVMeControllerStats: Received from client: %v", in)
return &pb.NVMeControllerStatsResponse{Stats: &pb.VolumeStats{ReadOpsCount: -1, WriteOpsCount: -1}}, nil
}

// ////////////////////////////////////////////////////////
Expand Down Expand Up @@ -292,6 +315,11 @@ func (s *server) CreateNVMeNamespace(ctx context.Context, in *pb.CreateNVMeNames
return nil, err
}
log.Printf("Received from SPDK: %v", result)
if result < 0 {
msg := fmt.Sprintf("Could not create NS: %s", in.NvMeNamespace.Spec.Id.Value)
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
namespaces[in.NvMeNamespace.Spec.Id.Value] = in.NvMeNamespace

response := &pb.NVMeNamespace{}
Expand All @@ -300,6 +328,7 @@ func (s *server) CreateNVMeNamespace(ctx context.Context, in *pb.CreateNVMeNames
log.Printf("error: %v", err)
return nil, err
}
response.Status = &pb.NVMeNamespaceStatus{PciState: 2, PciOperState: 1}
return response, nil
}

Expand Down Expand Up @@ -329,13 +358,20 @@ func (s *server) DeleteNVMeNamespace(ctx context.Context, in *pb.DeleteNVMeNames
return nil, err
}
log.Printf("Received from SPDK: %v", result)
if !result {
msg := fmt.Sprintf("Could not delete NS: %s", in.Name)
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
delete(namespaces, namespace.Spec.Id.Value)
return &emptypb.Empty{}, nil
}

func (s *server) UpdateNVMeNamespace(ctx context.Context, in *pb.UpdateNVMeNamespaceRequest) (*pb.NVMeNamespace, error) {
log.Printf("Received from client: %v", in.NvMeNamespace)
log.Printf("UpdateNVMeNamespace: Received from client: %v", in)
namespaces[in.NvMeNamespace.Spec.Id.Value] = in.NvMeNamespace
namespaces[in.NvMeNamespace.Spec.Id.Value].Status = &pb.NVMeNamespaceStatus{PciState: 2, PciOperState: 1}

response := &pb.NVMeNamespace{}
err := deepcopier.Copy(in.NvMeNamespace).To(response)
if err != nil {
Expand Down Expand Up @@ -417,8 +453,10 @@ func (s *server) GetNVMeNamespace(ctx context.Context, in *pb.GetNVMeNamespaceRe
for j := range rr.Namespaces {
r := &rr.Namespaces[j]
if int32(r.Nsid) == namespace.Spec.HostNsid {
return &pb.NVMeNamespace{Spec: &pb.NVMeNamespaceSpec{
Id: namespace.Spec.Id, HostNsid: namespace.Spec.HostNsid}}, nil
return &pb.NVMeNamespace{
Spec: &pb.NVMeNamespaceSpec{Id: namespace.Spec.Id, HostNsid: namespace.Spec.HostNsid},
Status: &pb.NVMeNamespaceStatus{PciState: 2, PciOperState: 1},
}, nil
}
}
msg := fmt.Sprintf("Could not find NSID: %d", namespace.Spec.HostNsid)
Expand All @@ -432,8 +470,8 @@ func (s *server) GetNVMeNamespace(ctx context.Context, in *pb.GetNVMeNamespaceRe
}

func (s *server) NVMeNamespaceStats(ctx context.Context, in *pb.NVMeNamespaceStatsRequest) (*pb.NVMeNamespaceStatsResponse, error) {
log.Printf("Received from client: %v", in.NamespaceId)
return &pb.NVMeNamespaceStatsResponse{}, nil
log.Printf("NVMeNamespaceStats: Received from client: %v", in)
return &pb.NVMeNamespaceStatsResponse{Stats: &pb.VolumeStats{ReadOpsCount: -1, WriteOpsCount: -1}}, nil
}

//////////////////////////////////////////////////////////
Expand Down
Loading