Skip to content

Commit 05c9949

Browse files
jainvipinglimchb
jainvipin
authored and
glimchb
committed
feat(storage): change id refs to name
Signed-off-by: Vipin Jain <[email protected]>
1 parent 6586529 commit 05c9949

File tree

5 files changed

+43
-44
lines changed

5 files changed

+43
-44
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/lithammer/fuzzysearch v1.1.8
1010
github.com/onsi/ginkgo/v2 v2.11.0
1111
github.com/onsi/gomega v1.27.9
12-
github.com/opiproject/opi-api v0.0.0-20230726170919-691a90a13429
12+
github.com/opiproject/opi-api v0.0.0-20230728150746-cc0946b7cec4
1313
github.com/spf13/cobra v1.7.0
1414
github.com/stretchr/testify v1.8.4
1515
golang.org/x/net v0.12.0

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU
3333
github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
3434
github.com/onsi/gomega v1.27.9 h1:qIyVWbOsvQEye2QCqLsNSeH/5L1RS9vS382erEWfT3o=
3535
github.com/onsi/gomega v1.27.9/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
36-
github.com/opiproject/opi-api v0.0.0-20230726170919-691a90a13429 h1:bvctyHEk77amCzqlP2Q40C7uTzgYCX/IEdpmAkvFw0Y=
37-
github.com/opiproject/opi-api v0.0.0-20230726170919-691a90a13429/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
36+
github.com/opiproject/opi-api v0.0.0-20230728150746-cc0946b7cec4 h1:wOsrhHoOo5h1S7BwcPoQsWPPb0ILV6QNX8Fc53GqQ/o=
37+
github.com/opiproject/opi-api v0.0.0-20230728150746-cc0946b7cec4/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
3838
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3939
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
4040
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

‎storage/backend.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func executeNvmeRemoteController(ctx context.Context, c4 pb.NvmeRemoteController
7878
}
7979
log.Printf("Created Nvme controller: %v", rr0)
8080
// continue
81-
rr2, err := c4.NvmeRemoteControllerReset(ctx, &pb.NvmeRemoteControllerResetRequest{Id: &pc.ObjectKey{Value: rr0.Name}})
81+
rr2, err := c4.NvmeRemoteControllerReset(ctx, &pb.NvmeRemoteControllerResetRequest{Name: rr0.Name})
8282
if err != nil {
8383
return err
8484
}
@@ -93,7 +93,7 @@ func executeNvmeRemoteController(ctx context.Context, c4 pb.NvmeRemoteController
9393
return err
9494
}
9595
log.Printf("Got Nvme: %v", rr4)
96-
rr5, err := c4.NvmeRemoteControllerStats(ctx, &pb.NvmeRemoteControllerStatsRequest{Id: &pc.ObjectKey{Value: rr0.Name}})
96+
rr5, err := c4.NvmeRemoteControllerStats(ctx, &pb.NvmeRemoteControllerStatsRequest{Name: rr0.Name})
9797
if err != nil {
9898
return err
9999
}
@@ -145,13 +145,13 @@ func executeNvmePath(ctx context.Context, c5 pb.NvmeRemoteControllerServiceClien
145145
np0, err := c5.CreateNvmePath(ctx, &pb.CreateNvmePathRequest{
146146
NvmePathId: resourceID,
147147
NvmePath: &pb.NvmePath{
148-
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
149-
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
150-
Traddr: addr[0].String(),
151-
Trsvcid: int64(port),
152-
Subnqn: "nqn.2016-06.io.spdk:cnode1",
153-
Hostnqn: "nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c",
154-
ControllerId: &pc.ObjectKey{Value: rr0.Name},
148+
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
149+
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
150+
Traddr: addr[0].String(),
151+
Trsvcid: int64(port),
152+
Subnqn: "nqn.2016-06.io.spdk:cnode1",
153+
Hostnqn: "nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c",
154+
ControllerNameRef: rr0.Name,
155155
}})
156156
if err != nil {
157157
return err
@@ -188,7 +188,7 @@ func executeNvmePath(ctx context.Context, c5 pb.NvmeRemoteControllerServiceClien
188188
return err
189189
}
190190
log.Printf("Got Nvme path: %s", np5.Name)
191-
np6, err := c5.NvmePathStats(ctx, &pb.NvmePathStatsRequest{Id: &pc.ObjectKey{Value: np0.Name}})
191+
np6, err := c5.NvmePathStats(ctx, &pb.NvmePathStatsRequest{Name: np0.Name})
192192
if err != nil {
193193
return err
194194
}

‎storage/frontend.go

+18-18
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
252252
NvmeControllerId: "namespace-test-ctrler",
253253
NvmeController: &pb.NvmeController{
254254
Spec: &pb.NvmeControllerSpec{
255-
SubsystemId: &pbc.ObjectKey{Value: rs1.Name},
255+
SubsystemNameRef: rs1.Name,
256256
PcieId: &pb.PciEndpoint{PhysicalFunction: 1, VirtualFunction: 2, PortId: 3},
257257
MaxNsq: 5,
258258
MaxNcq: 6,
@@ -279,12 +279,12 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
279279
NvmeNamespaceId: resourceID,
280280
NvmeNamespace: &pb.NvmeNamespace{
281281
Spec: &pb.NvmeNamespaceSpec{
282-
SubsystemId: &pbc.ObjectKey{Value: rs1.Name},
283-
VolumeId: &pbc.ObjectKey{Value: "Malloc1"},
284-
Uuid: &pbc.Uuid{Value: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb"},
285-
Nguid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb",
286-
Eui64: 1967554867335598546,
287-
HostNsid: 1}}})
282+
SubsystemNameRef: rs1.Name,
283+
VolumeNameRef: "Malloc1",
284+
Uuid: &pbc.Uuid{Value: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb"},
285+
Nguid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb",
286+
Eui64: 1967554867335598546,
287+
HostNsid: 1}}})
288288
if err != nil {
289289
return err
290290
}
@@ -307,12 +307,12 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
307307
NvmeNamespace: &pb.NvmeNamespace{
308308
Name: rn1.Name,
309309
Spec: &pb.NvmeNamespaceSpec{
310-
SubsystemId: &pbc.ObjectKey{Value: rs1.Name},
311-
VolumeId: &pbc.ObjectKey{Value: "Malloc1"},
312-
Uuid: &pbc.Uuid{Value: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb"},
313-
Nguid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb",
314-
Eui64: 1967554867335598546,
315-
HostNsid: 1}}})
310+
SubsystemNameRef: rs1.Name,
311+
VolumeNameRef: "Malloc1",
312+
Uuid: &pbc.Uuid{Value: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb"},
313+
Nguid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb",
314+
Eui64: 1967554867335598546,
315+
HostNsid: 1}}})
316316
if err != nil {
317317
return err
318318
}
@@ -327,7 +327,7 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
327327
return err
328328
}
329329
log.Printf("Got NvmeNamespace: %v", rn5.Name)
330-
rn6, err := c2.NvmeNamespaceStats(ctx, &pb.NvmeNamespaceStatsRequest{NamespaceId: &pbc.ObjectKey{Value: rn1.Name}})
330+
rn6, err := c2.NvmeNamespaceStats(ctx, &pb.NvmeNamespaceStatsRequest{Name: rn1.Name})
331331
if err != nil {
332332
return err
333333
}
@@ -385,7 +385,7 @@ func executeNvmeController(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
385385
NvmeControllerId: resourceID,
386386
NvmeController: &pb.NvmeController{
387387
Spec: &pb.NvmeControllerSpec{
388-
SubsystemId: &pbc.ObjectKey{Value: rs1.Name},
388+
SubsystemNameRef: rs1.Name,
389389
PcieId: &pb.PciEndpoint{PhysicalFunction: 1, VirtualFunction: 2, PortId: 3},
390390
MaxNsq: 5,
391391
MaxNcq: 6,
@@ -414,7 +414,7 @@ func executeNvmeController(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
414414
NvmeController: &pb.NvmeController{
415415
Name: rc1.Name,
416416
Spec: &pb.NvmeControllerSpec{
417-
SubsystemId: &pbc.ObjectKey{Value: rs1.Name},
417+
SubsystemNameRef: rs1.Name,
418418
PcieId: &pb.PciEndpoint{PhysicalFunction: 3, VirtualFunction: 2, PortId: 1},
419419
MaxNsq: 8,
420420
MaxNcq: 7,
@@ -438,7 +438,7 @@ func executeNvmeController(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
438438
}
439439
log.Printf("Got NvmeController: %s", rc5.Name)
440440

441-
rc6, err := c2.NvmeControllerStats(ctx, &pb.NvmeControllerStatsRequest{Id: &pbc.ObjectKey{Value: rc1.Name}})
441+
rc6, err := c2.NvmeControllerStats(ctx, &pb.NvmeControllerStatsRequest{Name: rc1.Name})
442442
if err != nil {
443443
return err
444444
}
@@ -514,7 +514,7 @@ func executeNvmeSubsystem(ctx context.Context, c1 pb.FrontendNvmeServiceClient)
514514
}
515515
log.Printf("Got UpdateNvmeSubsystem: %s", rs5.Spec.Nqn)
516516
rs6, err := c1.NvmeSubsystemStats(ctx, &pb.NvmeSubsystemStatsRequest{
517-
SubsystemId: &pbc.ObjectKey{Value: rs1.Name}})
517+
SubsystemNameRef: rs1.Name})
518518
if err != nil {
519519
return err
520520
}

‎storage/goopicsi.go

+12-13
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515

1616
"github.com/google/uuid"
1717

18-
pbc "github.com/opiproject/opi-api/common/v1/gen/go"
1918
pb "github.com/opiproject/opi-api/storage/v1alpha1/gen/go"
2019
"google.golang.org/grpc"
2120
"google.golang.org/grpc/credentials/insecure"
@@ -68,13 +67,13 @@ func NvmeControllerConnect(id string, trAddr string, subnqn string, trSvcID int6
6867
pathResponse, err := client.CreateNvmePath(ctx, &pb.CreateNvmePathRequest{
6968
NvmePathId: nvmeControllerToPathResourceID(id),
7069
NvmePath: &pb.NvmePath{
71-
ControllerId: &pbc.ObjectKey{Value: response.Name},
72-
Traddr: trAddr,
73-
Subnqn: subnqn,
74-
Trsvcid: trSvcID,
75-
Hostnqn: hostnqn,
76-
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
77-
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
70+
ControllerNameRef: response.Name,
71+
Traddr: trAddr,
72+
Subnqn: subnqn,
73+
Trsvcid: trSvcID,
74+
Hostnqn: hostnqn,
75+
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
76+
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
7877
},
7978
})
8079
if err != nil {
@@ -238,8 +237,8 @@ func ExposeRemoteNvme(subsystemNQN string, maxNamespaces int64) (string, string,
238237
NvmeController: &pb.NvmeController{
239238
Name: controllerID,
240239
Spec: &pb.NvmeControllerSpec{
241-
SubsystemId: &pbc.ObjectKey{Value: subsystemID},
242-
MaxNamespaces: int32(maxNamespaces),
240+
SubsystemNameRef: subsystemID,
241+
MaxNamespaces: int32(maxNamespaces),
243242
},
244243
},
245244
})
@@ -291,9 +290,9 @@ func CreateNvmeNamespace(id string, subSystemID string, nguid string, hostID int
291290
NvmeNamespace: &pb.NvmeNamespace{
292291
Name: id,
293292
Spec: &pb.NvmeNamespaceSpec{
294-
SubsystemId: &pbc.ObjectKey{Value: subSystemID},
295-
VolumeId: &pbc.ObjectKey{Value: volumeID},
296-
HostNsid: hostID,
293+
SubsystemNameRef: subSystemID,
294+
VolumeNameRef: volumeID,
295+
HostNsid: hostID,
297296
},
298297
},
299298
})

0 commit comments

Comments
 (0)