Feature/nvme tcp connect

base.go

@@ -100,6 +100,33 @@ func (bc *baseConnector) disconnectDevicesByDeviceName(ctx context.Context, name
 	return bc.cleanDevices(ctx, false, devices)
 }
 
+func (bc *baseConnector) disconnectNVMEDevicesByDeviceName(ctx context.Context, name string) error {
+	defer tracer.TraceFuncCall(ctx, "baseConnector.disconnectDevicesByDeviceName")()
+	if !bc.scsi.IsDeviceExist(ctx, name) {
+		logger.Info(ctx, "device %s not found", name)
+		return nil
+	}
+	var err error
+	var wwn string
+	if strings.HasPrefix(name, deviceMapperPrefix) {
+		wwn, err = bc.getDMWWN(ctx, name)
+
+	} else {
+		wwn, err = bc.scsi.GetNVMEDeviceWWN(ctx, []string{name})
+	}
+	if err != nil {
+		logger.Error(ctx, "can't find wwn for device: %s", err.Error())
+		return err
+	}
+
+	devices, err := bc.scsi.GetDevicesByWWN(ctx, wwn)
+	if err != nil {
+		logger.Error(ctx, "failed to find devices by wwn: %s", err.Error())
+		return err
+	}
+	return bc.cleanDevices(ctx, false, devices)
+}
+
 func (bc *baseConnector) cleanDevices(ctx context.Context,
 	force bool, devices []string) error {
 	defer tracer.TraceFuncCall(ctx, "baseConnector.cleanDevices")()

go.mod

@@ -1,11 +1,15 @@
 module github.com/dell/gobrick
 
-go 1.13
+go 1.17
+
+replace github.com/dell/gonvme => ../gonvme
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dell/goiscsi v1.1.0
+	github.com/dell/gonvme v0.0.0-20220214203653-9781a8511a08
 	github.com/golang/mock v1.3.1
 	github.com/stretchr/testify v1.4.0
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
+
 )

internal/scsi/interface.go

@@ -15,10 +15,12 @@ type SCSI interface {
 	DeleteSCSIDeviceByName(ctx context.Context, name string) error
 	DeleteSCSIDeviceByPath(ctx context.Context, devPath string) error
 	GetDeviceWWN(ctx context.Context, devices []string) (string, error)
+	GetNVMEDeviceWWN(ctx context.Context, devices []string) (string, error)
 	GetDevicesByWWN(ctx context.Context, wwn string) ([]string, error)
 	GetDMDeviceByChildren(ctx context.Context, devices []string) (string, error)
 	GetDMChildren(ctx context.Context, dmPath string) ([]string, error)
 	CheckDeviceIsValid(ctx context.Context, device string) bool
 	GetDeviceNameByHCTL(ctx context.Context, h scsi.HCTL) (string, error)
 	WaitUdevSymlink(ctx context.Context, deviceName string, wwn string) error
+	WaitUdevSymlinkNVMe(ctx context.Context, deviceName string, wwn string) error
 }

internal/wrappers/wrappers.go

@@ -4,11 +4,13 @@ package wrappers
 
 import (
 	"context"
-	"github.com/dell/goiscsi"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
+
+	"github.com/dell/goiscsi"
+	"github.com/dell/gonvme"
 )
 
 type LimitedFileInfo interface {
@@ -52,6 +54,16 @@ type ISCSILib interface {
 	CreateOrUpdateNode(target goiscsi.ISCSITarget, options map[string]string) error
 }
 
+type NVMeTCP interface {
+	DiscoverNVMeTCPTargets(address string, login bool) ([]gonvme.NVMeTarget, error)
+	GetInitiators(filename string) ([]string, error)
+	NVMeConnect(target gonvme.NVMeTarget) error
+	NVMeDisconnect(target gonvme.NVMeTarget) error
+	GetSessions() ([]gonvme.NVMESession, error)
+	ListNamespaceDevices() map[string][]string
+	GetNamespaceData(path string, namespaceID string) (string, error)
+}
+
 // wrappers
 
 type OSExecWrapper struct{}