Skip to content

Commit 46b94f4

Browse files
artek-koltunartek-koltun
committed
fix(storage): api update after enabling buf lint
Signed-off-by: Artsiom Koltun <[email protected]>
1 parent 1f3934c commit 46b94f4

File tree

6 files changed

+37
-30
lines changed

6 files changed

+37
-30
lines changed

‎storage/frontend/nvme_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ func (c *Client) CreateNvmeTCPController(
2929
var adrfam pb.NvmeAddressFamily
3030
switch {
3131
case ip.To4() != nil:
32-
adrfam = pb.NvmeAddressFamily_NVME_ADRFAM_IPV4
32+
adrfam = pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4
3333
case ip.To16() != nil:
34-
adrfam = pb.NvmeAddressFamily_NVME_ADRFAM_IPV6
34+
adrfam = pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV6
3535
default:
3636
return nil, fmt.Errorf("invalid ip address format: %v", ip)
3737
}
@@ -44,7 +44,7 @@ func (c *Client) CreateNvmeTCPController(
4444
NvmeControllerId: id,
4545
NvmeController: &pb.NvmeController{
4646
Spec: &pb.NvmeControllerSpec{
47-
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
47+
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
4848
Endpoint: &pb.NvmeControllerSpec_FabricsId{
4949
FabricsId: &pb.FabricsEndpoint{
5050
Traddr: ip.String(),
@@ -79,7 +79,7 @@ func (c *Client) CreateNvmePcieController(
7979
NvmeControllerId: id,
8080
NvmeController: &pb.NvmeController{
8181
Spec: &pb.NvmeControllerSpec{
82-
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_PCIE,
82+
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_PCIE,
8383
Endpoint: &pb.NvmeControllerSpec_PcieId{
8484
PcieId: &pb.PciEndpoint{
8585
PortId: wrapperspb.Int32(int32(port)),

‎storage/frontend/nvme_controller_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@ func TestCreateNvmeTCPController(t *testing.T) {
2727
ipV6Addr := net.ParseIP("::")
2828
testIPV4Controller := &pb.NvmeController{
2929
Spec: &pb.NvmeControllerSpec{
30-
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
30+
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
3131
Endpoint: &pb.NvmeControllerSpec_FabricsId{
3232
FabricsId: &pb.FabricsEndpoint{
3333
Traddr: ipV4Addr.String(),
3434
Trsvcid: "4420",
35-
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
35+
Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4,
3636
},
3737
},
3838
},
3939
}
4040
testIPV6Controller := &pb.NvmeController{
4141
Spec: &pb.NvmeControllerSpec{
42-
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
42+
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
4343
Endpoint: &pb.NvmeControllerSpec_FabricsId{
4444
FabricsId: &pb.FabricsEndpoint{
4545
Traddr: ipV6Addr.String(),
4646
Trsvcid: "4420",
47-
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV6,
47+
Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV6,
4848
},
4949
},
5050
},
@@ -166,7 +166,7 @@ func TestCreateNvmePcieController(t *testing.T) {
166166
subsystemName := "subsysPcie0Name"
167167
testPcieController := &pb.NvmeController{
168168
Spec: &pb.NvmeControllerSpec{
169-
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_PCIE,
169+
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_PCIE,
170170
Endpoint: &pb.NvmeControllerSpec_PcieId{
171171
PcieId: &pb.PciEndpoint{
172172
PortId: wrapperspb.Int32(0),

‎storage/goopicsi.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ func NvmeControllerConnect(id string, trAddr string, subnqn string, trSvcID int6
6969
NvmePathId: nvmeControllerToPathResourceID(id),
7070
NvmePath: &pb.NvmePath{
7171
Traddr: trAddr,
72-
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
72+
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
7373
Fabrics: &pb.FabricsPath{
7474
Subnqn: subnqn,
7575
Trsvcid: trSvcID,
7676
Hostnqn: hostnqn,
77-
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
77+
Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4,
7878
},
7979
},
8080
})
@@ -268,7 +268,7 @@ func CreateNvmeNamespace(id string, subSystemID string, nguid string, hostID int
268268
defer cancel()
269269

270270
client1 := pb.NewNullVolumeServiceClient(conn)
271-
response, err := client1.ListNullVolumes(ctx, &pb.ListNullVolumesRequest{Parent: "todo"})
271+
response, err := client1.ListNullVolumes(ctx, &pb.ListNullVolumesRequest{})
272272

273273
if err != nil {
274274
log.Println(err)
@@ -278,7 +278,7 @@ func CreateNvmeNamespace(id string, subSystemID string, nguid string, hostID int
278278
volumeData := response.NullVolumes
279279
volumeID := ""
280280
for _, data := range volumeData {
281-
uuid := strings.ReplaceAll(data.Uuid.Value, "-", "")
281+
uuid := strings.ReplaceAll(data.Uuid, "-", "")
282282
if uuid == nguid {
283283
volumeID = data.Name
284284
}

‎storage/test/backend.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,10 @@ func executeNvmePath(ctx context.Context, c5 pb.NvmeRemoteControllerServiceClien
153153
Parent: rr0.Name,
154154
NvmePathId: resourceID,
155155
NvmePath: &pb.NvmePath{
156-
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
156+
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
157157
Traddr: addr[0].String(),
158158
Fabrics: &pb.FabricsPath{
159-
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
159+
Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4,
160160
Trsvcid: int64(port),
161161
Subnqn: "nqn.2016-06.io.spdk:cnode1",
162162
Hostnqn: "nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c",
@@ -184,10 +184,10 @@ func executeNvmePath(ctx context.Context, c5 pb.NvmeRemoteControllerServiceClien
184184
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"*"}},
185185
NvmePath: &pb.NvmePath{
186186
Name: np0.Name,
187-
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
187+
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
188188
Traddr: addr[0].String(),
189189
Fabrics: &pb.FabricsPath{
190-
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
190+
Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4,
191191
Trsvcid: int64(port),
192192
Subnqn: "nqn.2016-06.io.spdk:cnode1",
193193
Hostnqn: "nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c",
@@ -272,7 +272,7 @@ func executeNullVolume(ctx context.Context, c1 pb.NullVolumeServiceClient) error
272272
return err
273273
}
274274
log.Printf("Updated Null: %v", rs3)
275-
rs4, err := c1.ListNullVolumes(ctx, &pb.ListNullVolumesRequest{Parent: "todo"})
275+
rs4, err := c1.ListNullVolumes(ctx, &pb.ListNullVolumesRequest{})
276276
if err != nil {
277277
return err
278278
}
@@ -331,7 +331,7 @@ func executeAioVolume(ctx context.Context, c2 pb.AioVolumeServiceClient) error {
331331
return err
332332
}
333333
log.Printf("Updated Aio: %v", ra3)
334-
ra4, err := c2.ListAioVolumes(ctx, &pb.ListAioVolumesRequest{Parent: "todo"})
334+
ra4, err := c2.ListAioVolumes(ctx, &pb.ListAioVolumesRequest{})
335335
if err != nil {
336336
return err
337337
}

‎storage/test/frontend.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"time"
1414

1515
"github.com/google/uuid"
16-
pbc "github.com/opiproject/opi-api/common/v1/gen/go"
1716
pb "github.com/opiproject/opi-api/storage/v1alpha1/gen/go"
1817
"google.golang.org/protobuf/proto"
1918

@@ -266,7 +265,7 @@ func executeVirtioBlk(ctx context.Context, c4 pb.FrontendVirtioBlkServiceClient)
266265
log.Printf("could not update VirtioBlk: %v", err)
267266
}
268267
log.Printf("Updated VirtioBlk: %v", rv3)
269-
rv4, err := c4.ListVirtioBlks(ctx, &pb.ListVirtioBlksRequest{Parent: "todo"})
268+
rv4, err := c4.ListVirtioBlks(ctx, &pb.ListVirtioBlksRequest{})
270269
if err != nil {
271270
return err
272271
}
@@ -325,10 +324,10 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
325324
FabricsId: &pb.FabricsEndpoint{
326325
Traddr: "127.0.0.1",
327326
Trsvcid: "4421",
328-
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
327+
Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4,
329328
},
330329
},
331-
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
330+
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
332331
MaxNsq: 5,
333332
MaxNcq: 6,
334333
Sqes: 7,
@@ -356,7 +355,7 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
356355
NvmeNamespace: &pb.NvmeNamespace{
357356
Spec: &pb.NvmeNamespaceSpec{
358357
VolumeNameRef: "Malloc1",
359-
Uuid: &pbc.Uuid{Value: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb"},
358+
Uuid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb",
360359
Nguid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb",
361360
Eui64: 1967554867335598546,
362361
HostNsid: 1}}})
@@ -383,7 +382,7 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
383382
Name: rn1.Name,
384383
Spec: &pb.NvmeNamespaceSpec{
385384
VolumeNameRef: "Malloc1",
386-
Uuid: &pbc.Uuid{Value: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb"},
385+
Uuid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb",
387386
Nguid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb",
388387
Eui64: 1967554867335598546,
389388
HostNsid: 1}}})
@@ -465,10 +464,10 @@ func executeNvmeController(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
465464
FabricsId: &pb.FabricsEndpoint{
466465
Traddr: "127.0.0.1",
467466
Trsvcid: "4421",
468-
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
467+
Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4,
469468
},
470469
},
471-
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
470+
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
472471
MaxNsq: 5,
473472
MaxNcq: 6,
474473
Sqes: 7,
@@ -500,10 +499,10 @@ func executeNvmeController(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
500499
FabricsId: &pb.FabricsEndpoint{
501500
Traddr: "127.0.0.1",
502501
Trsvcid: "4421",
503-
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
502+
Adrfam: pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_IPV4,
504503
},
505504
},
506-
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
505+
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TYPE_TCP,
507506
MaxNsq: 8,
508507
MaxNcq: 7,
509508
Sqes: 6,

‎testing/mock-server/server/server.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,15 @@ import (
2121
)
2222

2323
// GoopCSI mock gRPC server to implement mock service calls
24-
type GoopCSI struct{}
24+
type GoopCSI struct {
25+
pb.UnimplementedNullVolumeServiceServer
26+
pb.UnimplementedNvmeRemoteControllerServiceServer
27+
pb.UnimplementedFrontendNvmeServiceServer
28+
}
29+
30+
var _ pb.NullVolumeServiceServer = &GoopCSI{}
31+
var _ pb.NvmeRemoteControllerServiceServer = &GoopCSI{}
32+
var _ pb.FrontendNvmeServiceServer = &GoopCSI{}
2533

2634
// CreateNullVolume creates a mock NullVolume
2735
func (s *GoopCSI) CreateNullVolume(_ context2.Context, _ *pb.CreateNullVolumeRequest) (*pb.NullVolume, error) {

0 commit comments

Comments
 (0)