refactor: move opiAdressFamilyToSpdk to utils

Signed-off-by: Artsiom Koltun <[email protected]>
opiproject · Oct 2, 2023 · c7cd781 · c7cd781
1 parent 970a567
commit c7cd781
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/pkg/backend/nvme_path.go b/pkg/backend/nvme_path.go
@@ -88,7 +88,7 @@ func (s *Server) CreateNvmePath(_ context.Context, in *pb.CreateNvmePathRequest)
 		Name:      path.Base(controller.Name),
 		Trtype:    s.opiTransportToSpdk(in.NvmePath.GetTrtype()),
 		Traddr:    in.NvmePath.GetTraddr(),
-		Adrfam:    s.opiAdressFamilyToSpdk(in.NvmePath.GetFabrics().GetAdrfam()),
+		Adrfam:    utils.OpiAdressFamilyToSpdk(in.NvmePath.GetFabrics().GetAdrfam()),
 		Trsvcid:   fmt.Sprint(in.NvmePath.GetFabrics().GetTrsvcid()),
 		Subnqn:    in.NvmePath.GetFabrics().GetSubnqn(),
 		Hostnqn:   in.NvmePath.GetFabrics().GetHostnqn(),
@@ -133,7 +133,7 @@ func (s *Server) DeleteNvmePath(_ context.Context, in *pb.DeleteNvmePathRequest)
 		Name:    path.Base(controller.Name),
 		Trtype:  s.opiTransportToSpdk(nvmePath.GetTrtype()),
 		Traddr:  nvmePath.GetTraddr(),
-		Adrfam:  s.opiAdressFamilyToSpdk(nvmePath.GetFabrics().GetAdrfam()),
+		Adrfam:  utils.OpiAdressFamilyToSpdk(nvmePath.GetFabrics().GetAdrfam()),
 		Trsvcid: fmt.Sprint(nvmePath.GetFabrics().GetTrsvcid()),
 		Subnqn:  nvmePath.GetFabrics().GetSubnqn(),
 	}
@@ -270,14 +270,6 @@ func (s *Server) opiTransportToSpdk(transport pb.NvmeTransportType) string {
 	return strings.ReplaceAll(transport.String(), "NVME_TRANSPORT_", "")
 }
 
-func (s *Server) opiAdressFamilyToSpdk(adrfam pb.NvmeAddressFamily) string {
-	if adrfam == pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_UNSPECIFIED {
-		return ""
-	}
-
-	return strings.ReplaceAll(adrfam.String(), "NVME_ADRFAM_", "")
-}
-
 func (s *Server) opiMultipathToSpdk(multipath pb.NvmeMultipath) string {
 	return strings.ToLower(
 		strings.ReplaceAll(multipath.String(), "NVME_MULTIPATH_", ""),

diff --git a/pkg/utils/server.go b/pkg/utils/server.go
@@ -20,6 +20,7 @@ import (
 	"google.golang.org/grpc/status"
 
 	"github.com/opiproject/gospdk/spdk"
+	pb "github.com/opiproject/opi-api/storage/v1alpha1/gen/go"
 )
 
 // ExtractPagination is a helper function for List pagination to fetch PageSize and PageToken
@@ -145,3 +146,12 @@ func spdkMockServerCommunicate(rpc spdk.JSONRPC, l net.Listener, toSend []string
 func ResourceIDToVolumeName(resourceID string) string {
 	return fmt.Sprintf("//storage.opiproject.org/volumes/%s", resourceID)
 }
+
+// OpiAdressFamilyToSpdk converts opi address family to the one used in spdk
+func OpiAdressFamilyToSpdk(adrfam pb.NvmeAddressFamily) string {
+	if adrfam == pb.NvmeAddressFamily_NVME_ADDRESS_FAMILY_UNSPECIFIED {
+		return ""
+	}
+
+	return strings.ReplaceAll(adrfam.String(), "NVME_ADRFAM_", "")
+}