Add unit tests for isolated iSCSI code for attaching volumes (#1727)

clementnuss · Sep 26, 2024 · e648ed2 · e648ed2
1 parent 77449b3
commit e648ed2
Show file tree

Hide file tree

Showing 13 changed files with 5,485 additions and 425 deletions.
diff --git a/frontend/csi/utils_test.go b/frontend/csi/utils_test.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/netapp/trident/config"
 	mockControllerAPI "github.com/netapp/trident/mocks/mock_frontend/mock_csi/mock_controller_api"
+	"github.com/netapp/trident/mocks/mock_utils/mock_iscsi"
 	"github.com/netapp/trident/mocks/mock_utils/mock_models/mock_luks"
-	mock_iscsi "github.com/netapp/trident/mocks/mock_utils/mock_reconcile_utils"
 	"github.com/netapp/trident/utils"
 	"github.com/netapp/trident/utils/errors"
 	"github.com/netapp/trident/utils/models"

diff --git a/frontend/csi/volume_publish_manager_test.go b/frontend/csi/volume_publish_manager_test.go
@@ -15,8 +15,8 @@ import (
 	"go.uber.org/mock/gomock"
 
 	"github.com/netapp/trident/config"
+	"github.com/netapp/trident/mocks/mock_utils/mock_iscsi"
 	"github.com/netapp/trident/mocks/mock_utils/mock_models"
-	mock_iscsi "github.com/netapp/trident/mocks/mock_utils/mock_reconcile_utils"
 	"github.com/netapp/trident/utils"
 	"github.com/netapp/trident/utils/errors"
 	"github.com/netapp/trident/utils/models"

diff --git a/mocks/mock_utils/mock_iscsi/mock_iscsi_devices_client.go b/mocks/mock_utils/mock_iscsi/mock_iscsi_devices_client.go
diff --git a/mocks/mock_utils/mock_iscsi/mock_iscsi_filesystem_client.go b/mocks/mock_utils/mock_iscsi/mock_iscsi_filesystem_client.go
diff --git a/mocks/mock_utils/mock_iscsi/mock_iscsi_mount_client.go b/mocks/mock_utils/mock_iscsi/mock_iscsi_mount_client.go
diff --git a/mocks/mock_utils/mock_iscsi/mock_iscsi_os_client.go b/mocks/mock_utils/mock_iscsi/mock_iscsi_os_client.go
diff --git a/...s/mock_reconcile_utils/reconcile_utils.go → ..._utils/mock_iscsi/mock_reconcile_utils.go b/...s/mock_reconcile_utils/reconcile_utils.go → ..._utils/mock_iscsi/mock_reconcile_utils.go
diff --git a/utils/devices.go b/utils/devices.go
@@ -1193,5 +1193,5 @@ func findMultipathDeviceForDevice(ctx context.Context, device string) string {
 }
 
 func getLunSerial(ctx context.Context, path string) (string, error) {
-	return iscsi.GetLunSerial(ctx, path)
+	return iscsiClient.GetLunSerial(ctx, path)
 }
diff --git a/utils/iscsi.go b/utils/iscsi.go
@@ -14,6 +14,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/spf13/afero"
+
 	"github.com/netapp/trident/config"
 	"github.com/netapp/trident/internal/fiji"
 	. "github.com/netapp/trident/logging"
@@ -36,7 +38,7 @@ const (
 var (
 	IscsiUtils  = iscsi.NewReconcileUtils(chrootPathPrefix, NewOSClient())
 	iscsiClient = iscsi.NewDetailed(chrootPathPrefix, command, iscsi.DefaultSelfHealingExclusion, NewOSClient(),
-		NewDevicesClient(), NewFilesystemClient(), NewMountClient(), IscsiUtils)
+		NewDevicesClient(), NewFilesystemClient(), NewMountClient(), IscsiUtils, afero.Afero{Fs: afero.NewOsFs()})
 
 	// Non-persistent map to maintain flush delays/errors if any, for device path(s).
 	iSCSIVolumeFlushExceptions = make(map[string]time.Time)
@@ -996,7 +998,7 @@ func execIscsiadmCommand(ctx context.Context, args ...string) ([]byte, error) {
 }
 
 func listAllISCSIDevices(ctx context.Context) {
-	iscsi.ListAllDevices(ctx)
+	iscsiClient.ListAllDevices(ctx)
 }
 
 func getISCSISessionInfo(ctx context.Context) ([]iscsi.SessionInfo, error) {