Remove adapters

remove utils refactor adapter code

Author: jharrod

frontend/csi/node_server.go

@@ -1625,7 +1625,7 @@ func (p *Plugin) nodeStageISCSIVolume(
 	// Update in-mem map used for self-healing; do it after a volume has been staged.
 	// Beyond here if there is a problem with the session or there are missing LUNs
 	// then self-healing should be able to fix those issues.
-	newCtx := context.WithValue(ctx, iscsi.SessionInfoSource, utils.SessionSourceNodeStage)
+	newCtx := context.WithValue(ctx, iscsi.SessionInfoSource, iscsi.SessionSourceNodeStage)
 	p.iscsi.AddSession(newCtx, &publishedISCSISessions, publishInfo, req.GetVolumeId(), "", models.NotInvalid)
 	return nil
 }
@@ -2353,7 +2353,7 @@ func (p *Plugin) performISCSISelfHealing(ctx context.Context) {
 		Logc(ctx).WithError(err).Error("Failed to reset remediation value(s) for published iSCSI sessions. ")
 	}
 
-	if err := utils.PopulateCurrentSessions(ctx, &currentISCSISessions); err != nil {
+	if err := p.iscsi.PopulateCurrentSessions(ctx, &currentISCSISessions); err != nil {
 		Logc(ctx).WithError(err).
 			Error("Failed to get current state of iSCSI Sessions LUN mappings; skipping iSCSI self-heal cycle.")
 		return
@@ -2374,7 +2374,7 @@ func (p *Plugin) performISCSISelfHealing(ctx context.Context) {
 	// to temporary networking issue or logged-out sessions or LUNs that were never scanned for some sessions.
 
 	// SELF-HEAL STEP 1: Identify all sorted candidate stale portals and sorted candidate non-stale portals.
-	staleISCSIPortals, nonStaleISCSIPortals := utils.InspectAllISCSISessions(ctx, &publishedISCSISessions,
+	staleISCSIPortals, nonStaleISCSIPortals := p.iscsi.InspectAllISCSISessions(ctx, &publishedISCSISessions,
 		&currentISCSISessions, p.iSCSISelfHealingWaitTime)
 
 	// SELF-HEAL STEP 2: Attempt to fix all the stale portals.

frontend/csi/node_server_test.go

@@ -1102,7 +1102,7 @@ func getPortals(sessions *models.ISCSISessions, portalActions []PortalAction) []
 		portals[idx] = portalAction.Portal
 	}
 
-	utils.SortPortals(portals, sessions)
+	iscsi.SortPortals(portals, sessions)
 
 	return portals
 }

mocks/mock_utils/mock_fcp/mock_fcp_client.go

@@ -363,14 +363,15 @@ func RemoveSCSIDeviceByPublishInfo(ctx context.Context, publishInfo *tridentmode
 			return
 		}
 
-		deviceInfo, err := utils.GetDeviceInfoForLUN(ctx, hostSessionMap, int(publishInfo.IscsiLunNumber), publishInfo.IscsiTargetIQN, false)
+		deviceInfo, err := utils.IscsiClient.GetDeviceInfoForLUN(ctx, hostSessionMap, int(publishInfo.IscsiLunNumber),
+			publishInfo.IscsiTargetIQN, false)
 		if err != nil {
 			Logc(ctx).WithError(err).WithFields(fields).Error("Error getting device info.")
 		} else if deviceInfo == nil {
 			Logc(ctx).WithFields(fields).Error("No device info found.")
 		} else {
 			// Inform the host about the device removal
-			if _, err := utils.PrepareDeviceForRemoval(ctx, deviceInfo, publishInfo, nil, true, false); err != nil {
+			if _, err := utils.IscsiClient.PrepareDeviceForRemoval(ctx, deviceInfo, publishInfo, nil, true, false); err != nil {
 				Logc(ctx).WithError(err).WithFields(fields).Error("Error removing device.")
 			}
 		}
@@ -382,15 +383,16 @@ func RemoveSCSIDeviceByPublishInfo(ctx context.Context, publishInfo *tridentmode
 			return
 		}
 
-		deviceInfo, err := utils.GetDeviceInfoForFCPLUN(ctx, hostSessionMap, int(publishInfo.FCPLunNumber),
+		deviceInfo, err := utils.FcpClient.GetDeviceInfoForFCPLUN(ctx, hostSessionMap, int(publishInfo.FCPLunNumber),
 			publishInfo.FCTargetWWNN, false)
 		if err != nil {
 			Logc(ctx).WithError(err).WithFields(fields).Error("Error getting device info.")
 		} else if deviceInfo == nil {
 			Logc(ctx).WithFields(fields).Error("No device info found.")
 		} else {
 			// Inform the host about the device removal
-			if _, err := utils.PrepareDeviceForRemoval(ctx, deviceInfo, publishInfo, nil, true, false); err != nil {
+			if _, err := utils.IscsiClient.PrepareDeviceForRemoval(ctx, deviceInfo, publishInfo, nil, true,
+				false); err != nil {
 				Logc(ctx).WithError(err).WithFields(fields).Error("Error removing device.")
 			}
 		}

mocks/mock_utils/mock_iscsi/mock_iscsi_client.go

@@ -1556,7 +1556,7 @@ func ValidateSANDriver(
 	case tridentconfig.ContextDocker:
 		// Make sure this host is logged into the ONTAP iSCSI target
 		if config.SANType == sa.ISCSI {
-			err := utils.EnsureISCSISessionsWithPortalDiscovery(ctx, ips)
+			err := utils.IscsiClient.EnsureISCSISessionsWithPortalDiscovery(ctx, ips)
 			if err != nil {
 				return fmt.Errorf("error establishing iSCSI session: %v", err)
 			}

storage_drivers/common.go

@@ -26,7 +26,6 @@ import (
 	sa "github.com/netapp/trident/storage_attribute"
 	drivers "github.com/netapp/trident/storage_drivers"
 	"github.com/netapp/trident/storage_drivers/solidfire/api"
-	"github.com/netapp/trident/utils"
 	"github.com/netapp/trident/utils/errors"
 	"github.com/netapp/trident/utils/filesystem"
 	"github.com/netapp/trident/utils/iscsi"
@@ -636,7 +635,7 @@ func (d *SANStorageDriver) validate(ctx context.Context) error {
 
 	if d.Config.DriverContext == tridentconfig.ContextDocker {
 		// Validate the environment
-		isIscsiSupported := utils.ISCSISupported(ctx)
+		isIscsiSupported := d.iscsi.Supported(ctx)
 		if !isIscsiSupported {
 			Logc(ctx).Error("Host doesn't appear to support iSCSI.")
 			return errors.New("no iSCSI support on this host")

storage_drivers/ontap/ontap_common.go

@@ -590,15 +590,6 @@ func (c *Client) RemoveMultipathDeviceMappingWithRetries(ctx context.Context, de
 	return nil
 }
 
-// ------ TODO remove:  temporary functions to bridge the gap while we transition to the new iscsi client ------
-
-//func GetDeviceInfoForLUN(
-//	ctx context.Context, hostSessionMap map[int]int, lunID int, iSCSINodeName string, isDetachCall bool,
-//) (*models.ScsiDeviceInfo, error) {
-//	// TODO: check if we require both isDetachCall and needFSType
-//	return iscsiClient.GetDeviceInfoForLUN(ctx, hostSessionMap, lunID, iSCSINodeName, isDetachCall)
-//}
-
 // FindMultipathDeviceForDevice finds the devicemapper parent of a device name like /dev/sdx.
 func (c *Client) FindMultipathDeviceForDevice(ctx context.Context, device string) string {
 	Logc(ctx).WithField("device", device).Debug(">>>> iscsi.findMultipathDeviceForDevice")

storage_drivers/solidfire/solidfire_san.go

@@ -11,6 +11,6 @@ import (
 var (
 	command   = exec.NewCommand()
 	FcpUtils  = fcp.NewReconcileUtils(osutils.ChrootPathPrefix, osutils.New())
-	fcpClient = fcp.NewDetailed(osutils.ChrootPathPrefix, command, fcp.DefaultSelfHealingExclusion, osutils.New(),
+	FcpClient = fcp.NewDetailed(osutils.ChrootPathPrefix, command, fcp.DefaultSelfHealingExclusion, osutils.New(),
 		devices.New(), filesystem.New(mountClient), mountClient, FcpUtils)
 )