VsphereDevicePathResolver -> ScsiDevicePathResolver

Signed-off-by: Maria Shaldibina <[email protected]>
Kiemes · Dec 19, 2014 · e08a894 · e08a894
1 parent 229aea8
commit e08a894
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/...hresolver/vsphere_device_path_resolver.go → ...pathresolver/scsi_device_path_resolver.go b/...hresolver/vsphere_device_path_resolver.go → ...pathresolver/scsi_device_path_resolver.go
@@ -12,21 +12,21 @@ import (
 
 const maxScanRetries = 30
 
-type vsphereDevicePathResolver struct {
+type scsiDevicePathResolver struct {
 	diskWaitTimeout time.Duration
 	fs              boshsys.FileSystem
 }
 
-func NewVsphereDevicePathResolver(
+func NewScsiDevicePathResolver(
 	diskWaitTimeout time.Duration,
 	fs boshsys.FileSystem,
-) (vsphereDevicePathResolver vsphereDevicePathResolver) {
-	vsphereDevicePathResolver.fs = fs
-	vsphereDevicePathResolver.diskWaitTimeout = diskWaitTimeout
+) (scsiDevicePathResolver scsiDevicePathResolver) {
+	scsiDevicePathResolver.fs = fs
+	scsiDevicePathResolver.diskWaitTimeout = diskWaitTimeout
 	return
 }
 
-func (devicePathResolver vsphereDevicePathResolver) GetRealDevicePath(diskSettings boshsettings.DiskSettings) (realPath string, timedOut bool, err error) {
+func (devicePathResolver scsiDevicePathResolver) GetRealDevicePath(diskSettings boshsettings.DiskSettings) (realPath string, timedOut bool, err error) {
 	devicePaths, err := devicePathResolver.fs.Glob("/sys/bus/scsi/devices/*:0:0:0/block/*")
 	if err != nil {
 		return

diff --git a/...lver/vsphere_device_path_resolver_test.go → ...esolver/scsi_device_path_resolver_test.go b/...lver/vsphere_device_path_resolver_test.go → ...esolver/scsi_device_path_resolver_test.go
@@ -23,7 +23,7 @@ var _ = Describe("VSphere Path Resolver", func() {
 
 	BeforeEach(func() {
 		fs = fakesys.NewFakeFileSystem()
-		resolver = NewVsphereDevicePathResolver(sleepInterval, fs)
+		resolver = NewScsiDevicePathResolver(sleepInterval, fs)
 
 		fs.SetGlob("/sys/bus/scsi/devices/*:0:0:0/block/*", []string{
 			"/sys/bus/scsi/devices/0:0:0:0/block/sr0",

diff --git a/infrastructure/provider.go b/infrastructure/provider.go
@@ -29,7 +29,7 @@ func NewProvider(logger boshlog.Logger, platform boshplatform.Platform, options
 	mappedDevicePathResolver := boshdpresolv.NewMappedDevicePathResolver(500*time.Millisecond, fs)
 	virtioDevicePathResolver := boshdpresolv.NewVirtioDevicePathResolver(idDevicePathResolver, mappedDevicePathResolver, logger)
 
-	vsphereDevicePathResolver := boshdpresolv.NewVsphereDevicePathResolver(500*time.Millisecond, fs)
+	scsiDevicePathResolver := boshdpresolv.NewScsiDevicePathResolver(500*time.Millisecond, fs)
 	dummyDevicePathResolver := boshdpresolv.NewDummyDevicePathResolver()
 
 	resolver := NewRegistryEndpointResolver(
@@ -69,7 +69,7 @@ func NewProvider(logger boshlog.Logger, platform boshplatform.Platform, options
 		"openstack": openstackInfrastructure,
 		"dummy":     NewDummyInfrastructure(fs, dirProvider, platform, dummyDevicePathResolver),
 		"warden":    NewWardenInfrastructure(platform, dummyDevicePathResolver, wardenRegistryProvider),
-		"vsphere":   NewVsphereInfrastructure(platform, vsphereDevicePathResolver, logger),
+		"vsphere":   NewVsphereInfrastructure(platform, scsiDevicePathResolver, logger),
 	}
 	return
 }

diff --git a/infrastructure/provider_test.go b/infrastructure/provider_test.go
@@ -96,7 +96,7 @@ var _ = Describe("Provider", func() {
 		})
 
 		It("returns vsphere infrastructure", func() {
-			expectedDevicePathResolver := boshdpresolv.NewVsphereDevicePathResolver(
+			expectedDevicePathResolver := boshdpresolv.NewScsiDevicePathResolver(
 				500*time.Millisecond,
 				platform.GetFs(),
 			)