From 0bb4cb1f8c82362f9362566eab9fdc762ed37da1 Mon Sep 17 00:00:00 2001
From: Artsiom Koltun <artsiom.koltun@intel.com>
Date: Tue, 19 Sep 2023 13:09:27 +0200
Subject: [PATCH] feat(storage/backend): opi-api added TcpController and
 FabricsPath

Signed-off-by: Artsiom Koltun <artsiom.koltun@intel.com>
---
 storage/backend.go  | 34 +++++++++++++++++++++-------------
 storage/goopicsi.go | 10 ++++++----
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/storage/backend.go b/storage/backend.go
index 77e6efb..b33684f 100644
--- a/storage/backend.go
+++ b/storage/backend.go
@@ -56,8 +56,10 @@ func executeNvmeRemoteController(ctx context.Context, c4 pb.NvmeRemoteController
 			NvmeRemoteControllerId: resourceID,
 			NvmeRemoteController: &pb.NvmeRemoteController{
 				Multipath: pb.NvmeMultipath_NVME_MULTIPATH_MULTIPATH,
-				Hdgst:     false,
-				Ddgst:     false,
+				Tcp: &pb.TcpController{
+					Hdgst: false,
+					Ddgst: false,
+				},
 			}})
 		if err != nil {
 			return err
@@ -131,9 +133,11 @@ func executeNvmePath(ctx context.Context, c5 pb.NvmeRemoteControllerServiceClien
 		NvmeRemoteControllerId: ctrlrResourceID,
 		NvmeRemoteController: &pb.NvmeRemoteController{
 			Multipath: pb.NvmeMultipath_NVME_MULTIPATH_MULTIPATH,
-			Hdgst:     false,
-			Ddgst:     false,
-			Psk:       psk,
+			Tcp: &pb.TcpController{
+				Hdgst: false,
+				Ddgst: false,
+				Psk:   psk,
+			},
 		}})
 	if err != nil {
 		return err
@@ -145,12 +149,14 @@ func executeNvmePath(ctx context.Context, c5 pb.NvmeRemoteControllerServiceClien
 			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",
 				ControllerNameRef: rr0.Name,
+				Fabrics: &pb.FabricsPath{
+					Adrfam:  pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
+					Trsvcid: int64(port),
+					Subnqn:  "nqn.2016-06.io.spdk:cnode1",
+					Hostnqn: "nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c",
+				},
 			}})
 		if err != nil {
 			return err
@@ -175,12 +181,14 @@ func executeNvmePath(ctx context.Context, c5 pb.NvmeRemoteControllerServiceClien
 			NvmePath: &pb.NvmePath{
 				Name:              np0.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,
+				Fabrics: &pb.FabricsPath{
+					Adrfam:  pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
+					Trsvcid: int64(port),
+					Subnqn:  "nqn.2016-06.io.spdk:cnode1",
+					Hostnqn: "nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c",
+				},
 			}})
 		if err != nil {
 			return err
diff --git a/storage/goopicsi.go b/storage/goopicsi.go
index ef2d839..a6fb116 100644
--- a/storage/goopicsi.go
+++ b/storage/goopicsi.go
@@ -69,11 +69,13 @@ func NvmeControllerConnect(id string, trAddr string, subnqn string, trSvcID int6
 			NvmePath: &pb.NvmePath{
 				ControllerNameRef: response.Name,
 				Traddr:            trAddr,
-				Subnqn:            subnqn,
-				Trsvcid:           trSvcID,
-				Hostnqn:           hostnqn,
 				Trtype:            pb.NvmeTransportType_NVME_TRANSPORT_TCP,
-				Adrfam:            pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
+				Fabrics: &pb.FabricsPath{
+					Subnqn:  subnqn,
+					Trsvcid: trSvcID,
+					Hostnqn: hostnqn,
+					Adrfam:  pb.NvmeAddressFamily_NVME_ADRFAM_IPV4,
+				},
 			},
 		})
 		if err != nil {