Skip to content

Commit d4ade5d

Browse files
glimchbglimchb
committed
fix code after API changes
see opiproject/opi-api#183 Signed-off-by: Boris Glimcher <Boris.Glimcher@emc.com>
1 parent ff63cc8 commit d4ade5d

File tree

2 files changed

+50
-31
lines changed

2 files changed

+50
-31
lines changed

‎client/frontend.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func executeVirtioScsiLun(ctx context.Context, conn grpc.ClientConnInterface, c5
7171
if err != nil {
7272
log.Fatalf("could not get VirtioScsi subsystem: %v", err)
7373
}
74-
log.Printf("Got: %v", rl5.Lun.Bdev)
74+
log.Printf("Got: %v", rl5.Bdev)
7575
rl6, err := c6.VirtioScsiLunStats(ctx, &pb.VirtioScsiLunStatsRequest{ControllerId: 8})
7676
if err != nil {
7777
log.Fatalf("could not stats VirtioScsi subsystem: %v", err)
@@ -114,7 +114,7 @@ func executeVirtioScsiController(ctx context.Context, conn grpc.ClientConnInterf
114114
if err != nil {
115115
log.Fatalf("could not get VirtioScsi subsystem: %v", err)
116116
}
117-
log.Printf("Got: %s", rss5.Controller.Name)
117+
log.Printf("Got: %s", rss5.Name)
118118
rss6, err := c5.VirtioScsiControllerStats(ctx, &pb.VirtioScsiControllerStatsRequest{ControllerId: 8})
119119
if err != nil {
120120
log.Fatalf("could not stats VirtioScsi subsystem: %v", err)
@@ -146,7 +146,7 @@ func executeVirtioBlk(ctx context.Context, conn grpc.ClientConnInterface) error
146146
if err != nil {
147147
log.Fatalf("could not get VirtioBlk Controller: %v", err)
148148
}
149-
log.Printf("Got: %v", rv5.Controller.Name)
149+
log.Printf("Got: %v", rv5.Name)
150150
rv6, err := c4.VirtioBlkStats(ctx, &pb.VirtioBlkStatsRequest{ControllerId: 8})
151151
if err != nil {
152152
log.Fatalf("could not stats VirtioBlk Controller: %v", err)
@@ -219,7 +219,7 @@ func executeNVMeNamespace(ctx context.Context, conn grpc.ClientConnInterface) er
219219
if err != nil {
220220
log.Fatalf("could not get NVMe namespace: %v", err)
221221
}
222-
log.Printf("Got: %v", rn5.Namespace.Id.Value)
222+
log.Printf("Got: %v", rn5.Id.Value)
223223
rn6, err := c3.NVMeNamespaceStats(ctx, &pb.NVMeNamespaceStatsRequest{NamespaceId: &pbc.ObjectKey{Value: "namespace-test"}})
224224
if err != nil {
225225
log.Fatalf("could not stats NVMe namespace: %v", err)
@@ -295,7 +295,7 @@ func executeNVMeController(ctx context.Context, conn grpc.ClientConnInterface) e
295295
if err != nil {
296296
log.Fatalf("could not get NVMe controller: %v", err)
297297
}
298-
log.Printf("Got: %s", rc5.Controller.Id.Value)
298+
log.Printf("Got: %s", rc5.Id.Value)
299299

300300
rc6, err := c2.NVMeControllerStats(ctx, &pb.NVMeControllerStatsRequest{Id: &pbc.ObjectKey{Value: "controller-test"}})
301301
if err != nil {
@@ -350,7 +350,7 @@ func executeNVMeSubsystem(ctx context.Context, conn grpc.ClientConnInterface) er
350350
if err != nil {
351351
log.Fatalf("could not get NVMe subsystem: %v", err)
352352
}
353-
log.Printf("Got: %s", rs5.Subsystem.Nqn)
353+
log.Printf("Got: %s", rs5.Nqn)
354354
rs6, err := c1.NVMeSubsystemStats(ctx, &pb.NVMeSubsystemStatsRequest{
355355
SubsystemId: &pbc.ObjectKey{Value: "subsystem-test"}})
356356
if err != nil {

‎server/frontend.go

+44-25
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,16 @@ func (s *server) NVMeSubsystemDelete(ctx context.Context, in *pb.NVMeSubsystemDe
6767
return &emptypb.Empty{}, nil
6868
}
6969

70-
func (s *server) NVMeSubsystemUpdate(ctx context.Context, in *pb.NVMeSubsystemUpdateRequest) (*pb.NVMeSubsystemUpdateResponse, error) {
70+
func (s *server) NVMeSubsystemUpdate(ctx context.Context, in *pb.NVMeSubsystemUpdateRequest) (*pb.NVMeSubsystem, error) {
7171
log.Printf("NVMeSubsystemUpdate: Received from client: %v", in)
72-
return &pb.NVMeSubsystemUpdateResponse{}, nil
72+
subsystems[in.Subsystem.Id.Value] = in.Subsystem
73+
response := &pb.NVMeSubsystem{}
74+
err := deepcopier.Copy(in.Subsystem).To(response)
75+
if err != nil {
76+
log.Printf("error: %v", err)
77+
return nil, err
78+
}
79+
return response, nil
7380
}
7481

7582
func (s *server) NVMeSubsystemList(ctx context.Context, in *pb.NVMeSubsystemListRequest) (*pb.NVMeSubsystemListResponse, error) {
@@ -89,7 +96,7 @@ func (s *server) NVMeSubsystemList(ctx context.Context, in *pb.NVMeSubsystemList
8996
return &pb.NVMeSubsystemListResponse{Subsystem: Blobarray}, nil
9097
}
9198

92-
func (s *server) NVMeSubsystemGet(ctx context.Context, in *pb.NVMeSubsystemGetRequest) (*pb.NVMeSubsystemGetResponse, error) {
99+
func (s *server) NVMeSubsystemGet(ctx context.Context, in *pb.NVMeSubsystemGetRequest) (*pb.NVMeSubsystem, error) {
93100
log.Printf("NVMeSubsystemGet: Received from client: %v", in)
94101
subsys, ok := subsystems[in.SubsystemId.Value]
95102
if !ok {
@@ -109,7 +116,7 @@ func (s *server) NVMeSubsystemGet(ctx context.Context, in *pb.NVMeSubsystemGetRe
109116
for i := range result {
110117
r := &result[i]
111118
if r.Nqn == subsys.Nqn {
112-
return &pb.NVMeSubsystemGetResponse{Subsystem: &pb.NVMeSubsystem{Nqn: r.Nqn}}, nil
119+
return &pb.NVMeSubsystem{Nqn: r.Nqn}, nil
113120
}
114121
}
115122
msg := fmt.Sprintf("Could not find NQN: %s", subsys.Nqn)
@@ -154,10 +161,16 @@ func (s *server) NVMeControllerDelete(ctx context.Context, in *pb.NVMeController
154161
return &emptypb.Empty{}, nil
155162
}
156163

157-
func (s *server) NVMeControllerUpdate(ctx context.Context, in *pb.NVMeControllerUpdateRequest) (*pb.NVMeControllerUpdateResponse, error) {
164+
func (s *server) NVMeControllerUpdate(ctx context.Context, in *pb.NVMeControllerUpdateRequest) (*pb.NVMeController, error) {
158165
log.Printf("Received from client: %v", in.Controller)
159166
controllers[in.Controller.Id.Value] = in.Controller
160-
return &pb.NVMeControllerUpdateResponse{}, nil
167+
response := &pb.NVMeController{}
168+
err := deepcopier.Copy(in.Controller).To(response)
169+
if err != nil {
170+
log.Printf("error: %v", err)
171+
return nil, err
172+
}
173+
return response, nil
161174
}
162175

163176
func (s *server) NVMeControllerList(ctx context.Context, in *pb.NVMeControllerListRequest) (*pb.NVMeControllerListResponse, error) {
@@ -169,13 +182,13 @@ func (s *server) NVMeControllerList(ctx context.Context, in *pb.NVMeControllerLi
169182
return &pb.NVMeControllerListResponse{Controller: Blobarray}, nil
170183
}
171184

172-
func (s *server) NVMeControllerGet(ctx context.Context, in *pb.NVMeControllerGetRequest) (*pb.NVMeControllerGetResponse, error) {
185+
func (s *server) NVMeControllerGet(ctx context.Context, in *pb.NVMeControllerGetRequest) (*pb.NVMeController, error) {
173186
log.Printf("Received from client: %v", in.ControllerId)
174187
controller, ok := controllers[in.ControllerId.Value]
175188
if !ok {
176189
return nil, fmt.Errorf("error finding controller %s", in.ControllerId.Value)
177190
}
178-
return &pb.NVMeControllerGetResponse{Controller: controller}, nil
191+
return &pb.NVMeController{Id: in.ControllerId, NvmeControllerId: controller.NvmeControllerId}, nil
179192
}
180193

181194
func (s *server) NVMeControllerStats(ctx context.Context, in *pb.NVMeControllerStatsRequest) (*pb.NVMeControllerStatsResponse, error) {
@@ -250,10 +263,16 @@ func (s *server) NVMeNamespaceDelete(ctx context.Context, in *pb.NVMeNamespaceDe
250263
return &emptypb.Empty{}, nil
251264
}
252265

253-
func (s *server) NVMeNamespaceUpdate(ctx context.Context, in *pb.NVMeNamespaceUpdateRequest) (*pb.NVMeNamespaceUpdateResponse, error) {
266+
func (s *server) NVMeNamespaceUpdate(ctx context.Context, in *pb.NVMeNamespaceUpdateRequest) (*pb.NVMeNamespace, error) {
254267
log.Printf("Received from client: %v", in.Namespace)
255268
namespaces[in.Namespace.Id.Value] = in.Namespace
256-
return &pb.NVMeNamespaceUpdateResponse{}, nil
269+
response := &pb.NVMeNamespace{}
270+
err := deepcopier.Copy(in.Namespace).To(response)
271+
if err != nil {
272+
log.Printf("error: %v", err)
273+
return nil, err
274+
}
275+
return response, nil
257276
}
258277

259278
func (s *server) NVMeNamespaceList(ctx context.Context, in *pb.NVMeNamespaceListRequest) (*pb.NVMeNamespaceListResponse, error) {
@@ -296,7 +315,7 @@ func (s *server) NVMeNamespaceList(ctx context.Context, in *pb.NVMeNamespaceList
296315
return nil, status.Errorf(codes.InvalidArgument, msg)
297316
}
298317

299-
func (s *server) NVMeNamespaceGet(ctx context.Context, in *pb.NVMeNamespaceGetRequest) (*pb.NVMeNamespaceGetResponse, error) {
318+
func (s *server) NVMeNamespaceGet(ctx context.Context, in *pb.NVMeNamespaceGetRequest) (*pb.NVMeNamespace, error) {
300319
log.Printf("NVMeNamespaceGet: Received from client: %v", in)
301320
namespace, ok := namespaces[in.NamespaceId.Value]
302321
if !ok {
@@ -305,7 +324,7 @@ func (s *server) NVMeNamespaceGet(ctx context.Context, in *pb.NVMeNamespaceGetRe
305324
return nil, err
306325
}
307326
// TODO: do we even query SPDK to confirm if namespace is present?
308-
// return &pb.NVMeNamespaceGetResponse{Namespace: &namespace}, nil
327+
// return namespace, nil
309328

310329
// fetch subsystems -> namespaces from server, match the nsid to find the corresponding namespace
311330
subsys, ok := subsystems[namespace.SubsystemId.Value]
@@ -328,7 +347,7 @@ func (s *server) NVMeNamespaceGet(ctx context.Context, in *pb.NVMeNamespaceGetRe
328347
for j := range rr.Namespaces {
329348
r := &rr.Namespaces[j]
330349
if uint32(r.Nsid) == namespace.HostNsid {
331-
return &pb.NVMeNamespaceGetResponse{Namespace: namespace}, nil
350+
return &pb.NVMeNamespace{Id: namespace.Id, HostNsid: namespace.HostNsid}, nil
332351
}
333352
}
334353
msg := fmt.Sprintf("Could not find NSID: %d", namespace.HostNsid)
@@ -385,9 +404,9 @@ func (s *server) VirtioBlkDelete(ctx context.Context, in *pb.VirtioBlkDeleteRequ
385404
return &emptypb.Empty{}, nil
386405
}
387406

388-
func (s *server) VirtioBlkUpdate(ctx context.Context, in *pb.VirtioBlkUpdateRequest) (*pb.VirtioBlkUpdateResponse, error) {
407+
func (s *server) VirtioBlkUpdate(ctx context.Context, in *pb.VirtioBlkUpdateRequest) (*pb.VirtioBlk, error) {
389408
log.Printf("Received from client: %v", in)
390-
return &pb.VirtioBlkUpdateResponse{}, nil
409+
return &pb.VirtioBlk{}, nil
391410
}
392411

393412
func (s *server) VirtioBlkList(ctx context.Context, in *pb.VirtioBlkListRequest) (*pb.VirtioBlkListResponse, error) {
@@ -407,7 +426,7 @@ func (s *server) VirtioBlkList(ctx context.Context, in *pb.VirtioBlkListRequest)
407426
return &pb.VirtioBlkListResponse{Controller: Blobarray}, nil
408427
}
409428

410-
func (s *server) VirtioBlkGet(ctx context.Context, in *pb.VirtioBlkGetRequest) (*pb.VirtioBlkGetResponse, error) {
429+
func (s *server) VirtioBlkGet(ctx context.Context, in *pb.VirtioBlkGetRequest) (*pb.VirtioBlk, error) {
411430
log.Printf("VirtioBlkGet: Received from client: %v", in)
412431
params := VhostGetControllersParams{
413432
Name: fmt.Sprint("VirtioBlk", in.GetControllerId()),
@@ -424,7 +443,7 @@ func (s *server) VirtioBlkGet(ctx context.Context, in *pb.VirtioBlkGetRequest) (
424443
log.Print(msg)
425444
return nil, status.Errorf(codes.InvalidArgument, msg)
426445
}
427-
return &pb.VirtioBlkGetResponse{Controller: &pb.VirtioBlk{Name: result[0].Ctrlr}}, nil
446+
return &pb.VirtioBlk{Name: result[0].Ctrlr}, nil
428447
}
429448

430449
func (s *server) VirtioBlkStats(ctx context.Context, in *pb.VirtioBlkStatsRequest) (*pb.VirtioBlkStatsResponse, error) {
@@ -470,9 +489,9 @@ func (s *server) VirtioScsiControllerDelete(ctx context.Context, in *pb.VirtioSc
470489
return &emptypb.Empty{}, nil
471490
}
472491

473-
func (s *server) VirtioScsiControllerUpdate(ctx context.Context, in *pb.VirtioScsiControllerUpdateRequest) (*pb.VirtioScsiControllerUpdateResponse, error) {
492+
func (s *server) VirtioScsiControllerUpdate(ctx context.Context, in *pb.VirtioScsiControllerUpdateRequest) (*pb.VirtioScsiController, error) {
474493
log.Printf("Received from client: %v", in)
475-
return &pb.VirtioScsiControllerUpdateResponse{}, nil
494+
return &pb.VirtioScsiController{}, nil
476495
}
477496

478497
func (s *server) VirtioScsiControllerList(ctx context.Context, in *pb.VirtioScsiControllerListRequest) (*pb.VirtioScsiControllerListResponse, error) {
@@ -492,7 +511,7 @@ func (s *server) VirtioScsiControllerList(ctx context.Context, in *pb.VirtioScsi
492511
return &pb.VirtioScsiControllerListResponse{Controller: Blobarray}, nil
493512
}
494513

495-
func (s *server) VirtioScsiControllerGet(ctx context.Context, in *pb.VirtioScsiControllerGetRequest) (*pb.VirtioScsiControllerGetResponse, error) {
514+
func (s *server) VirtioScsiControllerGet(ctx context.Context, in *pb.VirtioScsiControllerGetRequest) (*pb.VirtioScsiController, error) {
496515
log.Printf("VirtioScsiControllerGet: Received from client: %v", in)
497516
params := VhostGetControllersParams{
498517
Name: fmt.Sprint("OPI-VirtioScsi", in.GetControllerId()),
@@ -509,7 +528,7 @@ func (s *server) VirtioScsiControllerGet(ctx context.Context, in *pb.VirtioScsiC
509528
log.Print(msg)
510529
return nil, status.Errorf(codes.InvalidArgument, msg)
511530
}
512-
return &pb.VirtioScsiControllerGetResponse{Controller: &pb.VirtioScsiController{Name: result[0].Ctrlr}}, nil
531+
return &pb.VirtioScsiController{Name: result[0].Ctrlr}, nil
513532
}
514533

515534
func (s *server) VirtioScsiControllerStats(ctx context.Context, in *pb.VirtioScsiControllerStatsRequest) (*pb.VirtioScsiControllerStatsResponse, error) {
@@ -562,9 +581,9 @@ func (s *server) VirtioScsiLunDelete(ctx context.Context, in *pb.VirtioScsiLunDe
562581
return &emptypb.Empty{}, nil
563582
}
564583

565-
func (s *server) VirtioScsiLunUpdate(ctx context.Context, in *pb.VirtioScsiLunUpdateRequest) (*pb.VirtioScsiLunUpdateResponse, error) {
584+
func (s *server) VirtioScsiLunUpdate(ctx context.Context, in *pb.VirtioScsiLunUpdateRequest) (*pb.VirtioScsiLun, error) {
566585
log.Printf("Received from client: %v", in)
567-
return &pb.VirtioScsiLunUpdateResponse{}, nil
586+
return &pb.VirtioScsiLun{}, nil
568587
}
569588

570589
func (s *server) VirtioScsiLunList(ctx context.Context, in *pb.VirtioScsiLunListRequest) (*pb.VirtioScsiLunListResponse, error) {
@@ -584,7 +603,7 @@ func (s *server) VirtioScsiLunList(ctx context.Context, in *pb.VirtioScsiLunList
584603
return &pb.VirtioScsiLunListResponse{Lun: Blobarray}, nil
585604
}
586605

587-
func (s *server) VirtioScsiLunGet(ctx context.Context, in *pb.VirtioScsiLunGetRequest) (*pb.VirtioScsiLunGetResponse, error) {
606+
func (s *server) VirtioScsiLunGet(ctx context.Context, in *pb.VirtioScsiLunGetRequest) (*pb.VirtioScsiLun, error) {
588607
log.Printf("VirtioScsiLunGet: Received from client: %v", in)
589608
params := VhostGetControllersParams{
590609
Name: fmt.Sprint("OPI-VirtioScsi", in.GetControllerId()),
@@ -601,7 +620,7 @@ func (s *server) VirtioScsiLunGet(ctx context.Context, in *pb.VirtioScsiLunGetRe
601620
log.Print(msg)
602621
return nil, status.Errorf(codes.InvalidArgument, msg)
603622
}
604-
return &pb.VirtioScsiLunGetResponse{Lun: &pb.VirtioScsiLun{Bdev: result[0].Ctrlr}}, nil
623+
return &pb.VirtioScsiLun{Bdev: result[0].Ctrlr}, nil
605624
}
606625

607626
func (s *server) VirtioScsiLunStats(ctx context.Context, in *pb.VirtioScsiLunStatsRequest) (*pb.VirtioScsiLunStatsResponse, error) {

0 commit comments

Comments
 (0)