Skip to content

Commit

Permalink
feat(store): replace go maps with gokv in tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Boris Glimcher <[email protected]>
  • Loading branch information
@glimchb
glimchb committed Oct 20, 2023
1 parent be58607 commit d8fc63e
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 54 deletions.
36 changes: 18 additions & 18 deletions pkg/frontend/nvme_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ func TestFrontEnd_CreateNvmeController(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)
if tt.exist {
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
// testEnv.opiSpdkServer.Controllers[testControllerID].Spec.Id = &pc.ObjectKey{Value: testControllerID}
}
if tt.out != nil {
Expand Down Expand Up @@ -368,9 +368,9 @@ func TestFrontEnd_DeleteNvmeController(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)

request := &pb.DeleteNvmeControllerRequest{Name: tt.in, AllowMissing: tt.missing}
response, err := testEnv.client.DeleteNvmeController(testEnv.ctx, request)
Expand Down Expand Up @@ -570,9 +570,9 @@ func TestFrontEnd_UpdateNvmeController(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)

request := &pb.UpdateNvmeControllerRequest{NvmeController: tt.in, UpdateMask: tt.mask}
response, err := testEnv.client.UpdateNvmeController(testEnv.ctx, request)
Expand Down Expand Up @@ -751,9 +751,9 @@ func TestFrontEnd_ListNvmeControllers(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)
testEnv.opiSpdkServer.Pagination["existing-pagination-token"] = 1

request := &pb.ListNvmeControllersRequest{Parent: tt.in, PageSize: tt.size, PageToken: tt.token}
Expand Down Expand Up @@ -861,9 +861,9 @@ func TestFrontEnd_GetNvmeController(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)

request := &pb.GetNvmeControllerRequest{Name: tt.in}
response, err := testEnv.client.GetNvmeController(testEnv.ctx, request)
Expand Down Expand Up @@ -966,9 +966,9 @@ func TestFrontEnd_StatsNvmeController(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)

request := &pb.StatsNvmeControllerRequest{Name: tt.in}
response, err := testEnv.client.StatsNvmeController(testEnv.ctx, request)
Expand Down
36 changes: 18 additions & 18 deletions pkg/frontend/nvme_namespace_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,10 @@ func TestFrontEnd_CreateNvmeNamespace(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
if tt.exist {
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)
}
if tt.out != nil {
tt.out = utils.ProtoClone(tt.out)
Expand Down Expand Up @@ -353,9 +353,9 @@ func TestFrontEnd_DeleteNvmeNamespace(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)
request := &pb.DeleteNvmeNamespaceRequest{Name: tt.in, AllowMissing: tt.missing}
response, err := testEnv.client.DeleteNvmeNamespace(testEnv.ctx, request)

Expand Down Expand Up @@ -439,9 +439,9 @@ func TestFrontEnd_UpdateNvmeNamespace(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)
request := &pb.UpdateNvmeNamespaceRequest{NvmeNamespace: tt.in, UpdateMask: tt.mask}
response, err := testEnv.client.UpdateNvmeNamespace(testEnv.ctx, request)

Expand Down Expand Up @@ -643,9 +643,9 @@ func TestFrontEnd_ListNvmeNamespaces(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)
testEnv.opiSpdkServer.Pagination["existing-pagination-token"] = 1

request := &pb.ListNvmeNamespacesRequest{Parent: tt.in, PageSize: tt.size, PageToken: tt.token}
Expand Down Expand Up @@ -763,9 +763,9 @@ func TestFrontEnd_GetNvmeNamespace(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)

request := &pb.GetNvmeNamespaceRequest{Name: tt.in}
response, err := testEnv.client.GetNvmeNamespace(testEnv.ctx, request)
Expand Down Expand Up @@ -868,9 +868,9 @@ func TestFrontEnd_StatsNvmeNamespace(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)

request := &pb.StatsNvmeNamespaceRequest{Name: tt.in}
response, err := testEnv.client.StatsNvmeNamespace(testEnv.ctx, request)
Expand Down
36 changes: 18 additions & 18 deletions pkg/frontend/nvme_subsystem_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@ func TestFrontEnd_CreateNvmeSubsystem(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)
if tt.exist {
testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
// testEnv.opiSpdkServer.Subsystems[testSubsystemID].Spec.Id = &pc.ObjectKey{Value: testSubsystemID}
}
if tt.out != nil {
Expand Down Expand Up @@ -328,9 +328,9 @@ func TestFrontEnd_DeleteNvmeSubsystem(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)

request := &pb.DeleteNvmeSubsystemRequest{Name: tt.in, AllowMissing: tt.missing}
response, err := testEnv.client.DeleteNvmeSubsystem(testEnv.ctx, request)
Expand Down Expand Up @@ -417,9 +417,9 @@ func TestFrontEnd_UpdateNvmeSubsystem(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)

request := &pb.UpdateNvmeSubsystemRequest{NvmeSubsystem: tt.in, UpdateMask: tt.mask}
response, err := testEnv.client.UpdateNvmeSubsystem(testEnv.ctx, request)
Expand Down Expand Up @@ -552,9 +552,9 @@ func TestFrontEnd_ListNvmeSubsystem(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)
testEnv.opiSpdkServer.Pagination["existing-pagination-token"] = 1

request := &pb.ListNvmeSubsystemsRequest{PageSize: tt.size, PageToken: tt.token}
Expand Down Expand Up @@ -659,9 +659,9 @@ func TestFrontEnd_GetNvmeSubsystem(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)

request := &pb.GetNvmeSubsystemRequest{Name: tt.in}
response, err := testEnv.client.GetNvmeSubsystem(testEnv.ctx, request)
Expand Down Expand Up @@ -760,9 +760,9 @@ func TestFrontEnd_StatsNvmeSubsystem(t *testing.T) {
testEnv := createTestEnvironment(tt.spdk)
defer testEnv.Close()

testEnv.opiSpdkServer.Subsystems[testSubsystemName] = utils.ProtoClone(&testSubsystemWithStatus)
testEnv.opiSpdkServer.Controllers[testControllerName] = utils.ProtoClone(&testControllerWithStatus)
testEnv.opiSpdkServer.Namespaces[testNamespaceName] = utils.ProtoClone(&testNamespaceWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testSubsystemName, &testSubsystemWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testControllerName, &testControllerWithStatus)
_ = testEnv.opiSpdkServer.store.Set(testNamespaceName, &testNamespaceWithStatus)

request := &pb.StatsNvmeSubsystemRequest{Name: tt.in}
response, err := testEnv.client.StatsNvmeSubsystem(testEnv.ctx, request)
Expand Down

0 comments on commit d8fc63e

Please sign in to comment.