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

Move test environment creation into utils. #297

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move test environment creation into utils. #297

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
87 changes: 17 additions & 70 deletions pkg/backend/backend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,85 +7,32 @@ package backend

import (
"context"
"log"
"net"
"os"

"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/test/bufconn"

pb "github.com/opiproject/opi-api/storage/v1alpha1/gen/go"
"github.com/opiproject/opi-spdk-bridge/pkg/server"
)

// TODO: move test infrastructure code to a separate (test/server) package to avoid duplication

type backendClient struct {
pb.NVMfRemoteControllerServiceClient
pb.NullDebugServiceClient
pb.AioControllerServiceClient
}

type testEnv struct {
*server.TestEnv
opiSpdkServer *Server
client *backendClient
ln net.Listener
testSocket string
client *server.TestOpiClient
ctx context.Context
conn *grpc.ClientConn
jsonRPC server.JSONRPC
}

func (e *testEnv) Close() {
server.CloseListener(e.ln)
if err := os.RemoveAll(e.testSocket); err != nil {
log.Fatal(err)
}
server.CloseGrpcConnection(e.conn)
}

func createTestEnvironment(startSpdkServer bool, spdkResponses []string) *testEnv {
env := &testEnv{}
env.testSocket = server.GenerateSocketName("backend")
env.ln, env.jsonRPC = server.CreateTestSpdkServer(env.testSocket, startSpdkServer, spdkResponses)
env.opiSpdkServer = NewServer(env.jsonRPC)

ctx := context.Background()
conn, err := grpc.DialContext(ctx,
"",
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithContextDialer(dialer(env.opiSpdkServer)))
if err != nil {
log.Fatal(err)
}

env.ctx = ctx
env.conn = conn

env.client = &backendClient{
pb.NewNVMfRemoteControllerServiceClient(env.conn),
pb.NewNullDebugServiceClient(env.conn),
pb.NewAioControllerServiceClient(env.conn),
}

return env
}

func dialer(opiSpdkServer *Server) func(context.Context, string) (net.Conn, error) {
listener := bufconn.Listen(1024 * 1024)
server := grpc.NewServer()
pb.RegisterNVMfRemoteControllerServiceServer(server, opiSpdkServer)
pb.RegisterNullDebugServiceServer(server, opiSpdkServer)
pb.RegisterAioControllerServiceServer(server, opiSpdkServer)

go func() {
if err := server.Serve(listener); err != nil {
log.Fatal(err)
}
}()

return func(context.Context, string) (net.Conn, error) {
return listener.Dial()
}
var opiSpdkServer *Server
env := server.CreateTestEnvironment(startSpdkServer, spdkResponses,
func(jsonRPC server.JSONRPC) server.TestOpiServer {
opiSpdkServer = NewServer(jsonRPC)
return server.TestOpiServer{
FrontendNvmeServiceServer: &pb.UnimplementedFrontendNvmeServiceServer{},
FrontendVirtioBlkServiceServer: &pb.UnimplementedFrontendVirtioBlkServiceServer{},
FrontendVirtioScsiServiceServer: &pb.UnimplementedFrontendVirtioScsiServiceServer{},
MiddleendServiceServer: &pb.UnimplementedMiddleendServiceServer{},
AioControllerServiceServer: opiSpdkServer,
NullDebugServiceServer: opiSpdkServer,
NVMfRemoteControllerServiceServer: opiSpdkServer,
}
})
return &testEnv{env, opiSpdkServer, env.Client, env.Ctx}
}
86 changes: 17 additions & 69 deletions pkg/frontend/frontend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,84 +7,32 @@ package frontend

import (
"context"
"log"
"net"
"os"

"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/test/bufconn"

pb "github.com/opiproject/opi-api/storage/v1alpha1/gen/go"
"github.com/opiproject/opi-spdk-bridge/pkg/server"
)

// TODO: move test infrastructure code to a separate (test/server) package to avoid duplication

type frontendClient struct {
pb.FrontendNvmeServiceClient
pb.FrontendVirtioBlkServiceClient
pb.FrontendVirtioScsiServiceClient
}

type testEnv struct {
*server.TestEnv
opiSpdkServer *Server
client *frontendClient
ln net.Listener
testSocket string
client *server.TestOpiClient
ctx context.Context
conn *grpc.ClientConn
jsonRPC server.JSONRPC
}

func (e *testEnv) Close() {
server.CloseListener(e.ln)
server.CloseGrpcConnection(e.conn)
if err := os.RemoveAll(e.testSocket); err != nil {
log.Fatal(err)
}
}

func createTestEnvironment(startSpdkServer bool, spdkResponses []string) *testEnv {
env := &testEnv{}
env.testSocket = server.GenerateSocketName("frontend")
env.ln, env.jsonRPC = server.CreateTestSpdkServer(env.testSocket, startSpdkServer, spdkResponses)
env.opiSpdkServer = NewServer(env.jsonRPC)

ctx := context.Background()
conn, err := grpc.DialContext(ctx,
"",
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithContextDialer(dialer(env.opiSpdkServer)))
if err != nil {
log.Fatal(err)
}
env.ctx = ctx
env.conn = conn

env.client = &frontendClient{
pb.NewFrontendNvmeServiceClient(env.conn),
pb.NewFrontendVirtioBlkServiceClient(env.conn),
pb.NewFrontendVirtioScsiServiceClient(env.conn),
}

return env
}

func dialer(opiSpdkServer *Server) func(context.Context, string) (net.Conn, error) {
listener := bufconn.Listen(1024 * 1024)
server := grpc.NewServer()
pb.RegisterFrontendNvmeServiceServer(server, opiSpdkServer)
pb.RegisterFrontendVirtioBlkServiceServer(server, opiSpdkServer)
pb.RegisterFrontendVirtioScsiServiceServer(server, opiSpdkServer)

go func() {
if err := server.Serve(listener); err != nil {
log.Fatal(err)
}
}()

return func(context.Context, string) (net.Conn, error) {
return listener.Dial()
}
var opiSpdkServer *Server
env := server.CreateTestEnvironment(startSpdkServer, spdkResponses,
func(jsonRPC server.JSONRPC) server.TestOpiServer {
opiSpdkServer = NewServer(jsonRPC)
return server.TestOpiServer{
FrontendNvmeServiceServer: opiSpdkServer,
FrontendVirtioBlkServiceServer: opiSpdkServer,
FrontendVirtioScsiServiceServer: opiSpdkServer,
MiddleendServiceServer: &pb.UnimplementedMiddleendServiceServer{},
AioControllerServiceServer: &pb.UnimplementedAioControllerServiceServer{},
NullDebugServiceServer: &pb.UnimplementedNullDebugServiceServer{},
NVMfRemoteControllerServiceServer: &pb.UnimplementedNVMfRemoteControllerServiceServer{},
}
})
return &testEnv{env, opiSpdkServer, env.Client, env.Ctx}
}
79 changes: 17 additions & 62 deletions pkg/middleend/middleend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,11 @@ import (
"bytes"
"context"
"fmt"
"log"
"net"
"os"
"reflect"
"testing"

"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/status"
"google.golang.org/grpc/test/bufconn"

"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/emptypb"
Expand All @@ -29,68 +23,29 @@ import (
"github.com/opiproject/opi-spdk-bridge/pkg/server"
)

// TODO: move test infrastructure code to a separate (test/server) package to avoid duplication

type middleendClient struct {
pb.MiddleendServiceClient
}

type testEnv struct {
*server.TestEnv
opiSpdkServer *Server
client *middleendClient
ln net.Listener
testSocket string
client *server.TestOpiClient
ctx context.Context
conn *grpc.ClientConn
jsonRPC server.JSONRPC
}

func (e *testEnv) Close() {
server.CloseListener(e.ln)
if err := os.RemoveAll(e.testSocket); err != nil {
log.Fatal(err)
}
server.CloseGrpcConnection(e.conn)
}

func createTestEnvironment(startSpdkServer bool, spdkResponses []string) *testEnv {
env := &testEnv{}
env.testSocket = server.GenerateSocketName("middleend")
env.ln, env.jsonRPC = server.CreateTestSpdkServer(env.testSocket, startSpdkServer, spdkResponses)
env.opiSpdkServer = NewServer(env.jsonRPC)

ctx := context.Background()
conn, err := grpc.DialContext(ctx,
"",
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithContextDialer(dialer(env.opiSpdkServer)))
if err != nil {
log.Fatal(err)
}
env.ctx = ctx
env.conn = conn

env.client = &middleendClient{
pb.NewMiddleendServiceClient(env.conn),
}

return env
}

func dialer(opiSpdkServer *Server) func(context.Context, string) (net.Conn, error) {
listener := bufconn.Listen(1024 * 1024)
server := grpc.NewServer()
pb.RegisterMiddleendServiceServer(server, opiSpdkServer)

go func() {
if err := server.Serve(listener); err != nil {
log.Fatal(err)
}
}()

return func(context.Context, string) (net.Conn, error) {
return listener.Dial()
}
var opiSpdkServer *Server
env := server.CreateTestEnvironment(startSpdkServer, spdkResponses,
func(jsonRPC server.JSONRPC) server.TestOpiServer {
opiSpdkServer = NewServer(jsonRPC)
return server.TestOpiServer{
FrontendNvmeServiceServer: &pb.UnimplementedFrontendNvmeServiceServer{},
FrontendVirtioBlkServiceServer: &pb.UnimplementedFrontendVirtioBlkServiceServer{},
FrontendVirtioScsiServiceServer: &pb.UnimplementedFrontendVirtioScsiServiceServer{},
MiddleendServiceServer: opiSpdkServer,
AioControllerServiceServer: &pb.UnimplementedAioControllerServiceServer{},
NullDebugServiceServer: &pb.UnimplementedNullDebugServiceServer{},
NVMfRemoteControllerServiceServer: &pb.UnimplementedNVMfRemoteControllerServiceServer{},
}
})
return &testEnv{env, opiSpdkServer, env.Client, env.Ctx}
}

var (
Expand Down
Loading