update after review

Signed-off-by: 27149chen <7991675+27149chen@users.noreply.github.com>

remote/mounter/initiator/connectors/fibre_channel.go

@@ -22,7 +22,7 @@ func NewFibreChannelConnectorWithExecutor(executor utils.Executor) initiator.Con
 
 func NewFibreChannelConnectorWithAllFields(executor utils.Executor, initi initiator.Initiator) initiator.Connector {
 	logger := logs.GetLogger()
-	return &fibreChannelConnector{&scsiConnector{logger: logger, exec: executor, initi: initi}}
+	return &fibreChannelConnector{&scsiConnector{logger: logger, exec: executor, initiator: initi}}
 }
 
 func newFibreChannelConnector() *fibreChannelConnector {
@@ -33,17 +33,17 @@ func newFibreChannelConnector() *fibreChannelConnector {
 
 func newFibreChannelConnectorWithExecutorAndLogger(executor utils.Executor, logger logs.Logger) *fibreChannelConnector {
 	initi := initiator.NewLinuxFibreChannelWithExecutor(executor)
-	return &fibreChannelConnector{&scsiConnector{logger: logger, exec: executor, initi: initi}}
+	return &fibreChannelConnector{&scsiConnector{logger: logger, exec: executor, initiator: initi}}
 }
 
 // ConnectVolume attach the volume to host by rescaning all the active FC HBAs.
 func (c *fibreChannelConnector) ConnectVolume(volumeMountProperties *resources.VolumeMountProperties) error {
-	hbas := c.initi.GetHBAs()
+	hbas := c.initiator.GetHBAs()
 
 	if len(hbas) == 0 {
 		c.logger.Warning("No FC HBA is found.")
 		return nil
 	}
 
-	return c.initi.RescanHosts(hbas, volumeMountProperties)
+	return c.initiator.RescanHosts(hbas, volumeMountProperties)
 }

remote/mounter/initiator/connectors/iscsi.go

@@ -22,7 +22,7 @@ func NewISCSIConnectorWithExecutor(executor utils.Executor) initiator.Connector
 
 func NewISCSIConnectorWithAllFields(executor utils.Executor, initi initiator.Initiator) initiator.Connector {
 	logger := logs.GetLogger()
-	return &iscsiConnector{&scsiConnector{logger: logger, exec: executor, initi: initi}}
+	return &iscsiConnector{&scsiConnector{logger: logger, exec: executor, initiator: initi}}
 }
 
 func newISCSIConnector() *iscsiConnector {
@@ -33,7 +33,7 @@ func newISCSIConnector() *iscsiConnector {
 
 func newISCSIConnectorWithExecutorAndLogger(executor utils.Executor, logger logs.Logger) *iscsiConnector {
 	initi := initiator.NewLinuxISCSIWithExecutor(executor)
-	return &iscsiConnector{&scsiConnector{logger: logger, exec: executor, initi: initi}}
+	return &iscsiConnector{&scsiConnector{logger: logger, exec: executor, initiator: initi}}
 }
 
 func (c *iscsiConnector) ConnectVolume(volumeMountProperties *resources.VolumeMountProperties) error {

remote/mounter/initiator/connectors/scsi.go

@@ -10,9 +10,9 @@ import (
 )
 
 type scsiConnector struct {
-	exec   utils.Executor
-	logger logs.Logger
-	initi  initiator.Initiator
+	exec      utils.Executor
+	logger    logs.Logger
+	initiator initiator.Initiator
 }
 
 // DisconnectVolume will do following things:
@@ -33,7 +33,7 @@ func (c *scsiConnector) DisconnectVolume(volumeMountProperties *resources.Volume
 
 	// flush multipath device
 	c.logger.Info("Flush multipath device", logs.Args{{"name", devMapper}})
-	c.initi.FlushMultipath(devMapper)
+	c.initiator.FlushMultipath(devMapper)
 
 	for _, devName := range devNames {
 		device := fmt.Sprintf("/dev/%s", devName)
@@ -48,14 +48,14 @@ func (c *scsiConnector) DisconnectVolume(volumeMountProperties *resources.Volume
 
 	// If flushing the multipath failed before, try now after we have removed the devices.
 	c.logger.Info("Flush multipath device again after removing the devices", logs.Args{{"name", devMapper}})
-	c.initi.FlushMultipath(devMapper)
+	c.initiator.FlushMultipath(devMapper)
 	return nil
 }
 
 func (c *scsiConnector) removeDevices(devices []string) error {
 	var err error
 	for _, device := range devices {
-		err = c.initi.RemoveSCSIDevice(device)
+		err = c.initiator.RemoveSCSIDevice(device)
 	}
 	return err
 }