Fixes unit tests for all protocols

dell · Jun 20, 2024 · ca8717d · ca8717d
1 parent 3129b9d
commit ca8717d
Show file tree

Hide file tree

Showing 6 changed files with 249 additions and 26 deletions.
diff --git a/base_test.go b/base_test.go
@@ -381,7 +381,7 @@ func (bmh *baseMockHelper) SCSIWaitUdevSymlinkErr(
 	return bmh.SCSIWaitUdevSymlinkCall(m).Return(mh.ErrTest)
 }
 
-func BaseConnectorCleanDeviceMock(mock *baseMockHelper,
+func BaseConnectorCleanMultiPathDeviceMock(mock *baseMockHelper,
 	scsi *intscsi.MockSCSI, mp *intmultipath.MockMultipath,
 ) {
 	mock.SCSIGetDMDeviceByChildrenCallDevices = []string{
@@ -405,8 +405,22 @@ func BaseConnectorCleanDeviceMock(mock *baseMockHelper,
 	mock.MultipathDelPathOK(mp)
 }
 
+func BaseConnectorCleanDeviceMock(mock *baseMockHelper,
+	scsi *intscsi.MockSCSI,
+) {
+	mock.SCSIGetDMDeviceByChildrenCallDevices = []string{
+		mh.ValidDeviceName, mh.ValidDeviceName2,
+	}
+	mock.SCSIGetDMDeviceByChildrenErr(scsi)
+
+	mock.SCSIDeleteSCSIDeviceByNameCallName = mh.ValidDeviceName
+	mock.SCSIDeleteSCSIDeviceByNameOK(scsi)
+	mock.SCSIDeleteSCSIDeviceByNameCallName = mh.ValidDeviceName2
+	mock.SCSIDeleteSCSIDeviceByNameOK(scsi)
+}
+
 func BaserConnectorDisconnectDevicesByDeviceNameMock(mock *baseMockHelper,
-	scsi *intscsi.MockSCSI, mp *intmultipath.MockMultipath,
+	scsi *intscsi.MockSCSI,
 ) {
 	mock.SCSIIsDeviceExistCallDevice = mh.ValidDMName
 	mock.SCSIIsDeviceExistOKReturn = true
@@ -424,5 +438,5 @@ func BaserConnectorDisconnectDevicesByDeviceNameMock(mock *baseMockHelper,
 	mock.SCSIGetDevicesByWWNOKReturn = mh.ValidDevices
 	mock.SCSIGetDevicesByWWNOK(scsi)
 
-	BaseConnectorCleanDeviceMock(mock, scsi, mp)
+	BaseConnectorCleanDeviceMock(mock, scsi)
 }
diff --git a/fc_test.go b/fc_test.go
@@ -203,7 +203,11 @@ func cleanConnectionMock(mock *baseMockHelper,
 	mock.SCSIGetDeviceNameByHCTLCallH = validHCTL1Target1
 	mock.SCSIGetDeviceNameByHCTLErr(scsi).AnyTimes()
 
-	BaseConnectorCleanDeviceMock(mock, scsi, multipath)
+	if mock.MultipathIsDaemonRunningOKReturn {
+		BaseConnectorCleanMultiPathDeviceMock(mock, scsi, multipath)
+	} else {
+		BaseConnectorCleanDeviceMock(mock, scsi)
+	}
 }
 
 func TestFCConnector_ConnectVolume(t *testing.T) {
@@ -438,7 +442,7 @@ func TestFCConnector_DisconnectVolumeByDeviceName(t *testing.T) {
 			fields: getDefaultFCFields(ctrl),
 			stateSetter: func(fields fcFields) {
 				BaserConnectorDisconnectDevicesByDeviceNameMock(
-					&mock, fields.scsi, fields.multipath)
+					&mock, fields.scsi)
 			},
 			args:    defaultArgs,
 			wantErr: false,

diff --git a/gobrick_test.go b/gobrick_test.go
@@ -33,6 +33,7 @@ var (
 	validLunNumber     = 199
 	validSCSIHost1     = "34"
 	validSCSIHost2     = "35"
+	validNQN           = "11aaa111111111a11a111a1111aa1111"
 	validHostOnlyHCTL1 = scsi.HCTL{Host: validSCSIHost1, Channel: "-", Target: "-", Lun: "-"}
 	validHostOnlyHCTL2 = scsi.HCTL{Host: validSCSIHost2, Channel: "-", Target: "-", Lun: "-"}
 	validHCTL1         = scsi.HCTL{

diff --git a/iscsi_test.go b/iscsi_test.go
@@ -22,6 +22,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/dell/gobrick/internal/powerpath"
+
 	"github.com/dell/gobrick/internal/mockhelper"
 	intmultipath "github.com/dell/gobrick/internal/multipath"
 	intscsi "github.com/dell/gobrick/internal/scsi"
@@ -91,6 +93,7 @@ type iscsiFields struct {
 	scsi          *intscsi.MockSCSI
 	iscsiLib      *wrp.MockISCSILib
 	filePath      *wrp.MockLimitedFilepath
+	powerpath     *powerpath.MockPowerpath
 
 	manualSessionManagement                bool
 	waitDeviceTimeout                      time.Duration
@@ -106,12 +109,14 @@ func getDefaultISCSIFields(ctrl *gomock.Controller) iscsiFields {
 	bc := con.baseConnector
 	mpMock := intmultipath.NewMockMultipath(ctrl)
 	scsiMock := intscsi.NewMockSCSI(ctrl)
+	ppath := powerpath.NewMockPowerpath(ctrl)
 	bc.multipath = mpMock
 	bc.scsi = scsiMock
 	return iscsiFields{
 		baseConnector:                          bc,
 		multipath:                              mpMock,
 		scsi:                                   scsiMock,
+		powerpath:                              ppath,
 		iscsiLib:                               wrp.NewMockISCSILib(ctrl),
 		filePath:                               wrp.NewMockLimitedFilepath(ctrl),
 		manualSessionManagement:                con.manualSessionManagement,
@@ -394,6 +399,7 @@ func TestISCSIConnector_ConnectVolume(t *testing.T) {
 				baseConnector:                          tt.fields.baseConnector,
 				multipath:                              tt.fields.multipath,
 				scsi:                                   tt.fields.scsi,
+				powerpath:                              tt.fields.powerpath,
 				iscsiLib:                               tt.fields.iscsiLib,
 				manualSessionManagement:                tt.fields.manualSessionManagement,
 				waitDeviceTimeout:                      tt.fields.waitDeviceTimeout,
@@ -467,6 +473,7 @@ func TestISCSIConnector_GetInitiatorName(t *testing.T) {
 			c := &ISCSIConnector{
 				baseConnector:                          tt.fields.baseConnector,
 				multipath:                              tt.fields.multipath,
+				powerpath:                              tt.fields.powerpath,
 				scsi:                                   tt.fields.scsi,
 				iscsiLib:                               tt.fields.iscsiLib,
 				manualSessionManagement:                tt.fields.manualSessionManagement,
@@ -556,7 +563,7 @@ func TestISCSIConnector_DisconnectVolume(t *testing.T) {
 				mock.SCSIGetDeviceNameByHCTLCallH = validHCTL2
 				mock.SCSIGetDeviceNameByHCTLOK(fields.scsi)
 
-				BaseConnectorCleanDeviceMock(&mock, fields.scsi, fields.multipath)
+				BaseConnectorCleanDeviceMock(&mock, fields.scsi)
 			},
 			args:    defaultArgs,
 			wantErr: false,
@@ -567,6 +574,7 @@ func TestISCSIConnector_DisconnectVolume(t *testing.T) {
 			c := &ISCSIConnector{
 				baseConnector:                          tt.fields.baseConnector,
 				multipath:                              tt.fields.multipath,
+				powerpath:                              tt.fields.powerpath,
 				scsi:                                   tt.fields.scsi,
 				iscsiLib:                               tt.fields.iscsiLib,
 				manualSessionManagement:                tt.fields.manualSessionManagement,
@@ -613,7 +621,7 @@ func TestISCSIConnector_DisconnectVolumeByDeviceName(t *testing.T) {
 			name:   "ok",
 			fields: getDefaultISCSIFields(ctrl),
 			stateSetter: func(fields iscsiFields) {
-				BaserConnectorDisconnectDevicesByDeviceNameMock(&mock, fields.scsi, fields.multipath)
+				BaserConnectorDisconnectDevicesByDeviceNameMock(&mock, fields.scsi)
 			},
 			args:    defaultArgs,
 			wantErr: false,
@@ -624,6 +632,7 @@ func TestISCSIConnector_DisconnectVolumeByDeviceName(t *testing.T) {
 			c := &ISCSIConnector{
 				baseConnector:                          tt.fields.baseConnector,
 				multipath:                              tt.fields.multipath,
+				powerpath:                              tt.fields.powerpath,
 				scsi:                                   tt.fields.scsi,
 				iscsiLib:                               tt.fields.iscsiLib,
 				manualSessionManagement:                tt.fields.manualSessionManagement,

diff --git a/nvme.go b/nvme.go
@@ -279,13 +279,13 @@ func (c *NVMeConnector) cleanConnection(ctx context.Context, force bool, info NV
 	}
 	var devicePath string
 	var namespace string
-	logger.Debug(ctx, "DevicePathsAndNamespaces", DevicePathsAndNamespaces)
+	log.Debugf("DevicePathsAndNamespaces: %s", DevicePathsAndNamespaces)
 	for _, DevicePathAndNamespace := range DevicePathsAndNamespaces {
 		devicePath = DevicePathAndNamespace.DevicePath
 		namespace = DevicePathAndNamespace.Namespace
 		nguid, newnamespace, _ := c.nvmeLib.GetNVMeDeviceData(devicePath)
-		logger.Debug(ctx, "nguid, wwn, newnamespace, namespace", nguid, wwn, newnamespace, namespace)
-		if c.wwnMatches(ctx, nguid, wwn) && namespace == newnamespace {
+		log.Debugf("nguid: %s, wwn: %s, newnamespace: %s, namespace: %s", nguid, wwn, newnamespace, namespace)
+		if c.wwnMatches(nguid, wwn) && namespace == newnamespace {
 			devices = append(devices, devicePath)
 		}
 	}
@@ -496,13 +496,13 @@ func (c *NVMeConnector) discoverDevice(ctx context.Context, wg *sync.WaitGroup,
 		var devicePaths []string
 		var devicePath string
 		var namespace string
-		logger.Debug(ctx, "DevicePathsAndNamespaces", DevicePathsAndNamespaces, "retryCount", retryCount)
+		log.Debugf("DevicePathsAndNamespaces %+v retryCount %d", DevicePathsAndNamespaces, retryCount)
 		for _, DevicePathAndNamespace := range DevicePathsAndNamespaces {
 			devicePath = DevicePathAndNamespace.DevicePath
 			namespace = DevicePathAndNamespace.Namespace
 			nguid, newnamespace, _ := c.nvmeLib.GetNVMeDeviceData(devicePath)
-			logger.Debug(ctx, "nguid, wwn, newnamespace, namespace", nguid, wwn, newnamespace, namespace)
-			if c.wwnMatches(ctx, nguid, wwn) && namespace == newnamespace {
+			log.Debugf("nguid %s, wwn %s, newnamespace %s, namespace %s", nguid, wwn, newnamespace, namespace)
+			if c.wwnMatches(nguid, wwn) && namespace == newnamespace {
 				devicePaths = append(devicePaths, devicePath)
 				nguidResult = nguid
 				// using two nvme devices for each volume for the multipath discovery
@@ -526,19 +526,21 @@ func (c *NVMeConnector) discoverDevice(ctx context.Context, wg *sync.WaitGroup,
 	result <- devicePathResult
 }
 
-func (c *NVMeConnector) wwnMatches(ctx context.Context, nguid, wwn string) bool {
+func (c *NVMeConnector) wwnMatches(nguid, wwn string) bool {
 	/*
-		Sample wwn : naa.68ccf098001111a2222b3d4444a1b23c
-		wwn1 : 1111a2222b3d4444
-		wwn2 : a1b23c
-
-		Sample nguid : 1111a2222b3d44448ccf096800a1b23c
-
-		/ pmax:
-		nguid: 12635330303134340000976000012000
-		wwn:   60000970000120001263533030313434
-		nguid: wwn[last16] 		+ wwn[1:6] 	+ wwn[0] + wwn[7:15]
-			   1263533030313434 + 000097 	+ 6		 + 000012000
+			Sample wwn : naa.68ccf098001111a2222b3d4444a1b23c
+			wwn1 : 1111a2222b3d4444
+			wwn2 : a1b23c
+
+			Sample nguid : 1111a2222b3d44448ccf096800a1b23c
+
+			/ pmax:
+			nguid: 12635330303134340000976000012000
+			wwn:   60000970000120001263533030313434
+		           11aaa111111111a11a111a1111aa1111
+		           1a111a1111aa1111 1aaa11 1 1111111a1
+			nguid: wwn[last16] 		+ wwn[1:6] 	+ wwn[0] + wwn[7:15]
+				   1263533030313434 + 000097 	+ 6		 + 000012000
 	*/
 	if len(wwn) < 32 {
 		return false
@@ -555,7 +557,7 @@ func (c *NVMeConnector) wwnMatches(ctx context.Context, nguid, wwn string) bool
 		// pmax
 		wwn1 = wwn[16:]
 		wwn2 = wwn[1:7]
-		logger.Info(ctx, "Powermax:", wwn1, wwn2, nguid, strings.HasPrefix(nguid, wwn1+wwn2))
+		log.Infof("Powermax: %s %s %s %t", wwn1, wwn2, nguid, strings.HasPrefix(nguid, wwn1+wwn2))
 		if strings.HasPrefix(nguid, wwn1+wwn2) {
 			return true
 		}