Skip to content

Commit

Permalink
feat(storage): change id refs to name
Browse files Browse the repository at this point in the history 
Signed-off-by: Vipin Jain <[email protected]>
  • Loading branch information
@jainvipin
jainvipin committed Jul 28, 2023
1 parent 6586529 commit f921b95
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 43 deletions.
2 changes: 2 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/opiproject/opi-api v0.0.0-20230726170919-691a90a13429 => github.com/jainvipin/opi-api v0.0.0-20230727174915-645bea203166
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/jainvipin/opi-api v0.0.0-20230727174915-645bea203166 h1:Nv+WyNTAYKgqMbQp52VTnc2TxG4EEbVOd4UGK0BsFgE=
github.com/jainvipin/opi-api v0.0.0-20230727174915-645bea203166/go.mod h1:V7Uq6rglrcFryz4m0xStwyqy5xiXcU50xN9R00hGxds=
github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4=
github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4=
github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
github.com/onsi/gomega v1.27.9 h1:qIyVWbOsvQEye2QCqLsNSeH/5L1RS9vS382erEWfT3o=
github.com/onsi/gomega v1.27.9/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
github.com/opiproject/opi-api v0.0.0-20230726170919-691a90a13429 h1:bvctyHEk77amCzqlP2Q40C7uTzgYCX/IEdpmAkvFw0Y=
github.com/opiproject/opi-api v0.0.0-20230726170919-691a90a13429/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
Expand Down
20 changes: 10 additions & 10 deletions storage/backend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func executeNvmeRemoteController(ctx context.Context, c4 pb.NvmeRemoteController
}
log.Printf("Created Nvme controller: %v", rr0)
// continue
rr2, err := c4.NvmeRemoteControllerReset(ctx, &pb.NvmeRemoteControllerResetRequest{Id: &pc.ObjectKey{Value: rr0.Name}})
rr2, err := c4.NvmeRemoteControllerReset(ctx, &pb.NvmeRemoteControllerResetRequest{Name: rr0.Name})

Check warning on line 81 in storage/backend.go

View check run for this annotation

Codecov / codecov/patch

storage/backend.go#L81 

Added line #L81 was not covered by tests
if err != nil {
return err
}
Expand All @@ -93,7 +93,7 @@ func executeNvmeRemoteController(ctx context.Context, c4 pb.NvmeRemoteController
return err
}
log.Printf("Got Nvme: %v", rr4)
rr5, err := c4.NvmeRemoteControllerStats(ctx, &pb.NvmeRemoteControllerStatsRequest{Id: &pc.ObjectKey{Value: rr0.Name}})
rr5, err := c4.NvmeRemoteControllerStats(ctx, &pb.NvmeRemoteControllerStatsRequest{Name: rr0.Name})

Check warning on line 96 in storage/backend.go

View check run for this annotation

Codecov / codecov/patch

storage/backend.go#L96 

Added line #L96 was not covered by tests
if err != nil {
return err
}
Expand Down Expand Up @@ -145,13 +145,13 @@ func executeNvmePath(ctx context.Context, c5 pb.NvmeRemoteControllerServiceClien
np0, err := c5.CreateNvmePath(ctx, &pb.CreateNvmePathRequest{
NvmePathId: resourceID,
NvmePath: &pb.NvmePath{
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
Traddr: addr[0].String(),
Trsvcid: int64(port),
Subnqn: "nqn.2016-06.io.spdk:cnode1",
Hostnqn: "nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c",
ControllerId: &pc.ObjectKey{Value: rr0.Name},
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
Traddr: addr[0].String(),
Trsvcid: int64(port),
Subnqn: "nqn.2016-06.io.spdk:cnode1",
Hostnqn: "nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c",
ControllerNameRef: rr0.Name,

Check warning on line 154 in storage/backend.go

View check run for this annotation

Codecov / codecov/patch

storage/backend.go#L148-L154 

Added lines #L148 - L154 were not covered by tests
}})
if err != nil {
return err
Expand Down Expand Up @@ -188,7 +188,7 @@ func executeNvmePath(ctx context.Context, c5 pb.NvmeRemoteControllerServiceClien
return err
}
log.Printf("Got Nvme path: %s", np5.Name)
np6, err := c5.NvmePathStats(ctx, &pb.NvmePathStatsRequest{Id: &pc.ObjectKey{Value: np0.Name}})
np6, err := c5.NvmePathStats(ctx, &pb.NvmePathStatsRequest{Name: np0.Name})

Check warning on line 191 in storage/backend.go

View check run for this annotation

Codecov / codecov/patch

storage/backend.go#L191 

Added line #L191 was not covered by tests
if err != nil {
return err
}
Expand Down
36 changes: 18 additions & 18 deletions storage/frontend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
NvmeControllerId: "namespace-test-ctrler",
NvmeController: &pb.NvmeController{
Spec: &pb.NvmeControllerSpec{
SubsystemId: &pbc.ObjectKey{Value: rs1.Name},
SubsystemNameRef: rs1.Name,

Check warning on line 255 in storage/frontend.go

View check run for this annotation

Codecov / codecov/patch

storage/frontend.go#L255 

Added line #L255 was not covered by tests
PcieId: &pb.PciEndpoint{PhysicalFunction: 1, VirtualFunction: 2, PortId: 3},
MaxNsq: 5,
MaxNcq: 6,
Expand All @@ -279,12 +279,12 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
NvmeNamespaceId: resourceID,
NvmeNamespace: &pb.NvmeNamespace{
Spec: &pb.NvmeNamespaceSpec{
SubsystemId: &pbc.ObjectKey{Value: rs1.Name},
VolumeId: &pbc.ObjectKey{Value: "Malloc1"},
Uuid: &pbc.Uuid{Value: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb"},
Nguid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb",
Eui64: 1967554867335598546,
HostNsid: 1}}})
SubsystemNameRef: rs1.Name,
VolumeNameRef: "Malloc1",
Uuid: &pbc.Uuid{Value: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb"},
Nguid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb",
Eui64: 1967554867335598546,
HostNsid: 1}}})

Check warning on line 287 in storage/frontend.go

View check run for this annotation

Codecov / codecov/patch

storage/frontend.go#L282-L287 

Added lines #L282 - L287 were not covered by tests
if err != nil {
return err
}
Expand All @@ -307,12 +307,12 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
NvmeNamespace: &pb.NvmeNamespace{
Name: rn1.Name,
Spec: &pb.NvmeNamespaceSpec{
SubsystemId: &pbc.ObjectKey{Value: rs1.Name},
VolumeId: &pbc.ObjectKey{Value: "Malloc1"},
Uuid: &pbc.Uuid{Value: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb"},
Nguid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb",
Eui64: 1967554867335598546,
HostNsid: 1}}})
SubsystemNameRef: rs1.Name,
VolumeNameRef: "Malloc1",
Uuid: &pbc.Uuid{Value: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb"},
Nguid: "1b4e28ba-2fa1-11d2-883f-b9a761bde3fb",
Eui64: 1967554867335598546,
HostNsid: 1}}})

Check warning on line 315 in storage/frontend.go

View check run for this annotation

Codecov / codecov/patch

storage/frontend.go#L310-L315 

Added lines #L310 - L315 were not covered by tests
if err != nil {
return err
}
Expand All @@ -327,7 +327,7 @@ func executeNvmeNamespace(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
return err
}
log.Printf("Got NvmeNamespace: %v", rn5.Name)
rn6, err := c2.NvmeNamespaceStats(ctx, &pb.NvmeNamespaceStatsRequest{NamespaceId: &pbc.ObjectKey{Value: rn1.Name}})
rn6, err := c2.NvmeNamespaceStats(ctx, &pb.NvmeNamespaceStatsRequest{Name: rn1.Name})

Check warning on line 330 in storage/frontend.go

View check run for this annotation

Codecov / codecov/patch

storage/frontend.go#L330 

Added line #L330 was not covered by tests
if err != nil {
return err
}
Expand Down Expand Up @@ -385,7 +385,7 @@ func executeNvmeController(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
NvmeControllerId: resourceID,
NvmeController: &pb.NvmeController{
Spec: &pb.NvmeControllerSpec{
SubsystemId: &pbc.ObjectKey{Value: rs1.Name},
SubsystemNameRef: rs1.Name,

Check warning on line 388 in storage/frontend.go

View check run for this annotation

Codecov / codecov/patch

storage/frontend.go#L388 

Added line #L388 was not covered by tests
PcieId: &pb.PciEndpoint{PhysicalFunction: 1, VirtualFunction: 2, PortId: 3},
MaxNsq: 5,
MaxNcq: 6,
Expand Down Expand Up @@ -414,7 +414,7 @@ func executeNvmeController(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
NvmeController: &pb.NvmeController{
Name: rc1.Name,
Spec: &pb.NvmeControllerSpec{
SubsystemId: &pbc.ObjectKey{Value: rs1.Name},
SubsystemNameRef: rs1.Name,

Check warning on line 417 in storage/frontend.go

View check run for this annotation

Codecov / codecov/patch

storage/frontend.go#L417 

Added line #L417 was not covered by tests
PcieId: &pb.PciEndpoint{PhysicalFunction: 3, VirtualFunction: 2, PortId: 1},
MaxNsq: 8,
MaxNcq: 7,
Expand All @@ -438,7 +438,7 @@ func executeNvmeController(ctx context.Context, c2 pb.FrontendNvmeServiceClient)
}
log.Printf("Got NvmeController: %s", rc5.Name)

rc6, err := c2.NvmeControllerStats(ctx, &pb.NvmeControllerStatsRequest{Id: &pbc.ObjectKey{Value: rc1.Name}})
rc6, err := c2.NvmeControllerStats(ctx, &pb.NvmeControllerStatsRequest{Name: rc1.Name})

Check warning on line 441 in storage/frontend.go

View check run for this annotation

Codecov / codecov/patch

storage/frontend.go#L441 

Added line #L441 was not covered by tests
if err != nil {
return err
}
Expand Down Expand Up @@ -514,7 +514,7 @@ func executeNvmeSubsystem(ctx context.Context, c1 pb.FrontendNvmeServiceClient)
}
log.Printf("Got UpdateNvmeSubsystem: %s", rs5.Spec.Nqn)
rs6, err := c1.NvmeSubsystemStats(ctx, &pb.NvmeSubsystemStatsRequest{
SubsystemId: &pbc.ObjectKey{Value: rs1.Name}})
SubsystemNameRef: rs1.Name})

Check warning on line 517 in storage/frontend.go

View check run for this annotation

Codecov / codecov/patch

storage/frontend.go#L517 

Added line #L517 was not covered by tests
if err != nil {
return err
}
Expand Down
25 changes: 12 additions & 13 deletions storage/goopicsi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (

"github.com/google/uuid"

pbc "github.com/opiproject/opi-api/common/v1/gen/go"
pb "github.com/opiproject/opi-api/storage/v1alpha1/gen/go"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
Expand Down Expand Up @@ -68,13 +67,13 @@ func NvmeControllerConnect(id string, trAddr string, subnqn string, trSvcID int6
pathResponse, err := client.CreateNvmePath(ctx, &pb.CreateNvmePathRequest{
NvmePathId: nvmeControllerToPathResourceID(id),
NvmePath: &pb.NvmePath{
ControllerId: &pbc.ObjectKey{Value: response.Name},
Traddr: trAddr,
Subnqn: subnqn,
Trsvcid: trSvcID,
Hostnqn: hostnqn,
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
ControllerNameRef: response.Name,
Traddr: trAddr,
Subnqn: subnqn,
Trsvcid: trSvcID,
Hostnqn: hostnqn,
Trtype: pb.NvmeTransportType_NVME_TRANSPORT_TCP,
Adrfam: pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,

Check warning on line 76 in storage/goopicsi.go

View check run for this annotation

Codecov / codecov/patch

storage/goopicsi.go#L70-L76 

Added lines #L70 - L76 were not covered by tests
},
})
if err != nil {
Expand Down Expand Up @@ -238,8 +237,8 @@ func ExposeRemoteNvme(subsystemNQN string, maxNamespaces int64) (string, string,
NvmeController: &pb.NvmeController{
Name: controllerID,
Spec: &pb.NvmeControllerSpec{
SubsystemId: &pbc.ObjectKey{Value: subsystemID},
MaxNamespaces: int32(maxNamespaces),
SubsystemNameRef: subsystemID,
MaxNamespaces: int32(maxNamespaces),

Check warning on line 241 in storage/goopicsi.go

View check run for this annotation

Codecov / codecov/patch

storage/goopicsi.go#L240-L241 

Added lines #L240 - L241 were not covered by tests
},
},
})
Expand Down Expand Up @@ -291,9 +290,9 @@ func CreateNvmeNamespace(id string, subSystemID string, nguid string, hostID int
NvmeNamespace: &pb.NvmeNamespace{
Name: id,
Spec: &pb.NvmeNamespaceSpec{
SubsystemId: &pbc.ObjectKey{Value: subSystemID},
VolumeId: &pbc.ObjectKey{Value: volumeID},
HostNsid: hostID,
SubsystemNameRef: subSystemID,
VolumeNameRef: volumeID,
HostNsid: hostID,

Check warning on line 295 in storage/goopicsi.go

View check run for this annotation

Codecov / codecov/patch

storage/goopicsi.go#L293-L295 

Added lines #L293 - L295 were not covered by tests
},
},
})
Expand Down

0 comments on commit f921b95

Please sign in to comment.