fix(api): update tests for api changes

Signed-off-by: Mark Sanders <[email protected]>
opiproject · Jan 18, 2024 · 44968b3 · 44968b3
1 parent 2c4bafe
commit 44968b3
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 67 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (c) 2022-2023 Dell Inc, or its subsidiaries.
+// Copyright (c) 2022-2024 Dell Inc, or its subsidiaries.
 // Copyright (C) 2023 Intel Corporation
 package main
 

diff --git a/pkg/backend/aio_test.go b/pkg/backend/aio_test.go
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (c) 2022-2023 Dell Inc, or its subsidiaries.
+// Copyright (c) 2022-2024 Dell Inc, or its subsidiaries.
 // Copyright (C) 2023 Intel Corporation
 
 // Package backend implememnts the BackEnd APIs (network facing) of the storage Server
@@ -498,7 +498,7 @@ func TestBackEnd_ListAioVolumes(t *testing.T) {
 
 			testEnv.opiSpdkServer.Pagination["existing-pagination-token"] = 1
 
-			request := &pb.ListAioVolumesRequest{Parent: tt.in, PageSize: tt.size, PageToken: tt.token}
+			request := &pb.ListAioVolumesRequest{PageSize: tt.size, PageToken: tt.token}
 			response, err := testEnv.client.ListAioVolumes(testEnv.ctx, request)
 
 			if !utils.EqualProtoSlices(response.GetAioVolumes(), tt.out) {

diff --git a/pkg/backend/null.go b/pkg/backend/null.go
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (c) 2022-2023 Dell Inc, or its subsidiaries.
+// Copyright (c) 2022-2024 Dell Inc, or its subsidiaries.
 // Copyright (C) 2023 Intel Corporation
 
 // Package backend implememnts the BackEnd APIs (network facing) of the storage Server

diff --git a/pkg/backend/null_test.go b/pkg/backend/null_test.go
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (c) 2022-2023 Dell Inc, or its subsidiaries.
+// Copyright (c) 2022-2024 Dell Inc, or its subsidiaries.
 // Copyright (C) 2023 Intel Corporation
 
 // Package backend implememnts the BackEnd APIs (network facing) of the storage Server
@@ -503,7 +503,7 @@ func TestBackEnd_ListNullVolumes(t *testing.T) {
 
 			testEnv.opiSpdkServer.Pagination["existing-pagination-token"] = 1
 
-			request := &pb.ListNullVolumesRequest{Parent: tt.in, PageSize: tt.size, PageToken: tt.token}
+			request := &pb.ListNullVolumesRequest{PageSize: tt.size, PageToken: tt.token}
 			response, err := testEnv.client.ListNullVolumes(testEnv.ctx, request)
 
 			if !utils.EqualProtoSlices(response.GetNullVolumes(), tt.out) {

diff --git a/pkg/backend/nvme_path.go b/pkg/backend/nvme_path.go
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (c) 2022-2023 Dell Inc, or its subsidiaries.
+// Copyright (c) 2022-2024 Dell Inc, or its subsidiaries.
 // Copyright (C) 2023 Intel Corporation
 
 // Package backend implements the BackEnd APIs (network facing) of the storage Server

diff --git a/pkg/backend/nvme_path_test.go b/pkg/backend/nvme_path_test.go
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (c) 2022-2023 Dell Inc, or its subsidiaries.
+// Copyright (c) 2022-2024 Dell Inc, or its subsidiaries.
 // Copyright (C) 2023 Intel Corporation
 
 // Package backend implememnts the BackEnd APIs (network facing) of the storage Server
@@ -28,7 +28,7 @@ var (
 	testNvmePathID   = "mytest"
 	testNvmePathName = utils.ResourceIDToNvmePathName(testNvmeCtrlID, testNvmePathID)
 	testNvmePath     = pb.NvmePath{
-		Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
+		Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
 		Traddr: "127.0.0.1",
 		Fabrics: &pb.FabricsPath{
 			Adrfam:  pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
@@ -156,12 +156,12 @@ func TestBackEnd_CreateNvmePath(t *testing.T) {
 		"valid request with valid SPDK response for pcie": {
 			id: testNvmePathID,
 			in: &pb.NvmePath{
-				Trtype: pb.NvmeTransportType_NVME_TRANSPORT_PCIE,
+				Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_PCIE,
 				Traddr: "0000:af:00.0",
 			},
 			out: &pb.NvmePath{
 				Name:   testNvmePathName,
-				Trtype: pb.NvmeTransportType_NVME_TRANSPORT_PCIE,
+				Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_PCIE,
 				Traddr: "0000:af:00.0",
 			},
 			spdk:    []string{`{"id":%d,"error":{"code":0,"message":""},"result":["mytest"]}`},
@@ -197,7 +197,7 @@ func TestBackEnd_CreateNvmePath(t *testing.T) {
 		"tcp transport type missing fabrics": {
 			id: testAioVolumeID,
 			in: &pb.NvmePath{
-				Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TCP,
+				Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
 				Traddr:  "127.0.0.1",
 				Fabrics: nil,
 			},
@@ -211,7 +211,7 @@ func TestBackEnd_CreateNvmePath(t *testing.T) {
 		"pcie transport type with specified fabrics message": {
 			id: testAioVolumeID,
 			in: &pb.NvmePath{
-				Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_PCIE,
+				Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TYPE_PCIE,
 				Traddr:  "0000:af:00.0",
 				Fabrics: testNvmePath.Fabrics,
 			},
@@ -225,7 +225,7 @@ func TestBackEnd_CreateNvmePath(t *testing.T) {
 		"pcie transport type with specified tcp controller": {
 			id: testAioVolumeID,
 			in: &pb.NvmePath{
-				Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_PCIE,
+				Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TYPE_PCIE,
 				Traddr:  "0000:af:00.0",
 				Fabrics: nil,
 			},
@@ -239,13 +239,13 @@ func TestBackEnd_CreateNvmePath(t *testing.T) {
 		"not supported transport type": {
 			id: testNvmePathID,
 			in: &pb.NvmePath{
-				Trtype: pb.NvmeTransportType_NVME_TRANSPORT_CUSTOM,
+				Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_CUSTOM,
 				Traddr: testNvmePath.Traddr,
 			},
 			out:        nil,
 			spdk:       []string{},
 			errCode:    codes.InvalidArgument,
-			errMsg:     fmt.Sprintf("not supported transport type: %v", pb.NvmeTransportType_NVME_TRANSPORT_CUSTOM),
+			errMsg:     fmt.Sprintf("not supported transport type: %v", pb.NvmeTransportType_NVME_TRANSPORT_TYPE_CUSTOM),
 			exist:      false,
 			controller: &testNvmeCtrlWithName,
 		},
@@ -536,7 +536,7 @@ func TestBackEnd_UpdateNvmePath(t *testing.T) {
 			mask: nil,
 			in: &pb.NvmePath{
 				Name:   utils.ResourceIDToNvmePathName(testNvmeCtrlID, "unknown-id"),
-				Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
+				Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
 				Traddr: "127.0.0.1",
 				Fabrics: &pb.FabricsPath{
 					Adrfam:  pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
@@ -554,7 +554,7 @@ func TestBackEnd_UpdateNvmePath(t *testing.T) {
 			mask: nil,
 			in: &pb.NvmePath{
 				Name:   utils.ResourceIDToNvmePathName(testNvmeCtrlID, "unknown-id"),
-				Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
+				Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
 				Traddr: "127.0.0.1",
 				Fabrics: &pb.FabricsPath{
 					Adrfam:  pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
@@ -673,14 +673,14 @@ func TestBackEnd_ListNvmePaths(t *testing.T) {
 		// 	out: []*pb.NvmePath{
 		// 		{
 		// 			Name:    "Malloc0",
-		// 			Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TCP,
+		// 			Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
 		// 			Adrfam:  pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
 		// 			Traddr:  "127.0.0.1",
 		// 			Trsvcid: 4444,
 		// 		},
 		// 		{
 		// 			Name:    "Malloc1",
-		// 			Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TCP,
+		// 			Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
 		// 			Adrfam:  pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
 		// 			Traddr:  "127.0.0.1",
 		// 			Trsvcid: 4444,
@@ -700,14 +700,14 @@ func TestBackEnd_ListNvmePaths(t *testing.T) {
 		// 	out: []*pb.NvmePath{
 		// 		{
 		// 			Name:    "Malloc0",
-		// 			Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TCP,
+		// 			Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
 		// 			Adrfam:  pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
 		// 			Traddr:  "127.0.0.1",
 		// 			Trsvcid: 4444,
 		// 		},
 		// 		{
 		// 			Name:    "Malloc1",
-		// 			Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TCP,
+		// 			Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
 		// 			Adrfam:  pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
 		// 			Traddr:  "127.0.0.1",
 		// 			Trsvcid: 4444,
@@ -742,7 +742,7 @@ func TestBackEnd_ListNvmePaths(t *testing.T) {
 		// 	out: []*pb.NvmePath{
 		// 		{
 		// 			Name:    "Malloc0",
-		// 			Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TCP,
+		// 			Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
 		// 			Adrfam:  pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
 		// 			Traddr:  "127.0.0.1",
 		// 			Trsvcid: 4444,
@@ -759,7 +759,7 @@ func TestBackEnd_ListNvmePaths(t *testing.T) {
 		// 	out: []*pb.NvmePath{
 		// 		{
 		// 			Name:    "Malloc1",
-		// 			Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TCP,
+		// 			Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
 		// 			Adrfam:  pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
 		// 			Traddr:  "127.0.0.1",
 		// 			Trsvcid: 4444,
@@ -864,7 +864,7 @@ func TestBackEnd_GetNvmePath(t *testing.T) {
 		// 	in: testNvmePathName,
 		// 	out: &pb.NvmePath{
 		// 		Name:    "Malloc1",
-		// 		Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TCP,
+		// 		Trtype:  pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
 		// 		Adrfam:  pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
 		// 		Traddr:  "127.0.0.1",
 		// 		Trsvcid: 4444,

diff --git a/pkg/backend/nvme_path_validate.go b/pkg/backend/nvme_path_validate.go
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (c) 2022-2023 Dell Inc, or its subsidiaries.
+// Copyright (c) 2022-2024 Dell Inc, or its subsidiaries.
 
 // Package backend implememnts the BackEnd APIs (network facing) of the storage Server
 package backend

diff --git a/pkg/frontend/blk_test.go b/pkg/frontend/blk_test.go
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (c) 2022-2023 Dell Inc, or its subsidiaries.
+// Copyright (c) 2022-2024 Dell Inc, or its subsidiaries.
 // Copyright (C) 2023 Intel Corporation
 
 // Package frontend implements the FrontEnd APIs (host facing) of the storage Server
@@ -445,7 +445,7 @@ func TestFrontEnd_ListVirtioBlks(t *testing.T) {
 
 			testEnv.opiSpdkServer.Pagination["existing-pagination-token"] = 1
 
-			request := &pb.ListVirtioBlksRequest{Parent: tt.in, PageSize: tt.size, PageToken: tt.token}
+			request := &pb.ListVirtioBlksRequest{PageSize: tt.size, PageToken: tt.token}
 			response, err := testEnv.client.ListVirtioBlks(testEnv.ctx, request)
 
 			if !utils.EqualProtoSlices(response.GetVirtioBlks(), tt.out) {

diff --git a/pkg/frontend/frontend.go b/pkg/frontend/frontend.go
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (c) 2022-2023 Dell Inc, or its subsidiaries.
+// Copyright (c) 2022-2024 Dell Inc, or its subsidiaries.
 // Copyright (C) 2023 Intel Corporation
 
 // Package frontend implements the FrontEnd APIs (host facing) of the storage Server

diff --git a/pkg/frontend/frontend_test.go b/pkg/frontend/frontend_test.go
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (c) 2022-2023 Dell Inc, or its subsidiaries.
+// Copyright (c) 2022-2024 Dell Inc, or its subsidiaries.
 // Copyright (C) 2023 Intel Corporation
 
 // Package frontend implements the FrontEnd APIs (host facing) of the storage Server
@@ -106,7 +106,7 @@ func dialer(opiSpdkServer *Server) func(context.Context, string) (net.Conn, erro
 func TestFrontEnd_NewCustomizedServer(t *testing.T) {
 	validJSONRPC := spdk.NewClient("/some/path")
 	validNvmeTransports := map[pb.NvmeTransportType]NvmeTransport{
-		pb.NvmeTransportType_NVME_TRANSPORT_TCP: NewNvmeTCPTransport(validJSONRPC),
+		pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP: NewNvmeTCPTransport(validJSONRPC),
 	}
 	validVirtioBLkTransport := NewVhostUserBlkTransport()
 	validStore := gomap.NewStore(gomap.DefaultOptions)
@@ -136,7 +136,7 @@ func TestFrontEnd_NewCustomizedServer(t *testing.T) {
 			jsonRPC: validJSONRPC,
 			store:   validStore,
 			nvmeTransports: map[pb.NvmeTransportType]NvmeTransport{
-				pb.NvmeTransportType_NVME_TRANSPORT_TCP: nil,
+				pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP: nil,
 			},
 			virtioBlkTransport: validVirtioBLkTransport,
 			wantPanic:          true,