feat(storage): change id refs to name

Signed-off-by: Vipin Jain <[email protected]>
opiproject · Jul 28, 2023 · 4bb6179 · 4bb6179
1 parent 6586529
commit 4bb6179
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 41 deletions.
diff --git a/storage/backend.go b/storage/backend.go
@@ -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})
 		if err != nil {
 			return err
 		}
@@ -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})
 		if err != nil {
 			return err
 		}
@@ -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,
 			}})
 		if err != nil {
 			return err
@@ -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})
 		if err != nil {
 			return err
 		}

diff --git a/storage/frontend.go b/storage/frontend.go
@@ -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,
 				PcieId:           &pb.PciEndpoint{PhysicalFunction: 1, VirtualFunction: 2, PortId: 3},
 				MaxNsq:           5,
 				MaxNcq:           6,
@@ -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}}})
 		if err != nil {
 			return err
 		}
@@ -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}}})
 		if err != nil {
 			return err
 		}
@@ -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})
 		if err != nil {
 			return err
 		}
@@ -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,
 					PcieId:           &pb.PciEndpoint{PhysicalFunction: 1, VirtualFunction: 2, PortId: 3},
 					MaxNsq:           5,
 					MaxNcq:           6,
@@ -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,
 					PcieId:           &pb.PciEndpoint{PhysicalFunction: 3, VirtualFunction: 2, PortId: 1},
 					MaxNsq:           8,
 					MaxNcq:           7,
@@ -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})
 		if err != nil {
 			return err
 		}
@@ -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})
 		if err != nil {
 			return err
 		}

diff --git a/storage/goopicsi.go b/storage/goopicsi.go
@@ -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"
@@ -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,
 			},
 		})
 		if err != nil {
@@ -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),
 				},
 			},
 		})
@@ -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,
 			},
 		},
 	})