github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 04:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Rename Azure driver to Azure Disk driver

Browse Source
This commit is contained in:
Ernest Wong 2019-11-25 15:51:30 -08:00
parent 6be19d85f2
commit dd76fdfce5
No known key found for this signature in database
GPG Key ID: 2FA4704546158B3F
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
test/e2e/storage/drivers/in_tree.go
View File

@ -1399,26 +1399,26 @@ func (v *vSphereVolume) DeleteVolume() {
} }
// Azure // Azure
type azureDriver struct { type azureDiskDriver struct {
driverInfo testsuites.DriverInfo driverInfo testsuites.DriverInfo
} }
type azureVolume struct { type azureDiskVolume struct {
volumeName string volumeName string
} }
var _ testsuites.TestDriver = &azureDriver{} var _ testsuites.TestDriver = &azureDiskDriver{}
var _ testsuites.PreprovisionedVolumeTestDriver = &azureDriver{} var _ testsuites.PreprovisionedVolumeTestDriver = &azureDiskDriver{}
var _ testsuites.InlineVolumeTestDriver = &azureDriver{} var _ testsuites.InlineVolumeTestDriver = &azureDiskDriver{}
var _ testsuites.PreprovisionedPVTestDriver = &azureDriver{} var _ testsuites.PreprovisionedPVTestDriver = &azureDiskDriver{}
var _ testsuites.DynamicPVTestDriver = &azureDriver{} var _ testsuites.DynamicPVTestDriver = &azureDiskDriver{}
// InitAzureDriver returns azureDriver that implements TestDriver interface // InitAzureDiskDriver returns azureDiskDriver that implements TestDriver interface
func InitAzureDriver() testsuites.TestDriver { func InitAzureDiskDriver() testsuites.TestDriver {
return &azureDriver{ return &azureDiskDriver{
driverInfo: testsuites.DriverInfo{ driverInfo: testsuites.DriverInfo{
Name: "azure", Name: "azure-disk",
InTreePluginName: "kubernetes.io/azure-file", InTreePluginName: "kubernetes.io/azure-disk",
MaxFileSize: testpatterns.FileSizeMedium, MaxFileSize: testpatterns.FileSizeMedium,
SupportedSizeRange: volume.SizeRange{ SupportedSizeRange: volume.SizeRange{
Min: "5Gi", Min: "5Gi",
@ -1441,16 +1441,16 @@ func InitAzureDriver() testsuites.TestDriver {
} }
} }
func (a *azureDriver) GetDriverInfo() *testsuites.DriverInfo { func (a *azureDiskDriver) GetDriverInfo() *testsuites.DriverInfo {
return &a.driverInfo return &a.driverInfo
} }
func (a *azureDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) { func (a *azureDiskDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
framework.SkipUnlessProviderIs("azure") framework.SkipUnlessProviderIs("azure")
} }
func (a *azureDriver) GetVolumeSource(readOnly bool, fsType string, volume testsuites.TestVolume) *v1.VolumeSource { func (a *azureDiskDriver) GetVolumeSource(readOnly bool, fsType string, volume testsuites.TestVolume) *v1.VolumeSource {
av, ok := volume.(*azureVolume) av, ok := volume.(*azureDiskVolume)
gomega.Expect(ok).To(gomega.BeTrue(), "Failed to cast test volume to Azure test volume") gomega.Expect(ok).To(gomega.BeTrue(), "Failed to cast test volume to Azure test volume")
diskName := av.volumeName[(strings.LastIndex(av.volumeName, "/") + 1):] diskName := av.volumeName[(strings.LastIndex(av.volumeName, "/") + 1):]
@ -1470,8 +1470,8 @@ func (a *azureDriver) GetVolumeSource(readOnly bool, fsType string, volume tests
return &volSource return &volSource
} }
func (a *azureDriver) GetPersistentVolumeSource(readOnly bool, fsType string, volume testsuites.TestVolume) (*v1.PersistentVolumeSource, *v1.VolumeNodeAffinity) { func (a *azureDiskDriver) GetPersistentVolumeSource(readOnly bool, fsType string, volume testsuites.TestVolume) (*v1.PersistentVolumeSource, *v1.VolumeNodeAffinity) {
av, ok := volume.(*azureVolume) av, ok := volume.(*azureDiskVolume)
gomega.Expect(ok).To(gomega.BeTrue(), "Failed to cast test volume to Azure test volume") gomega.Expect(ok).To(gomega.BeTrue(), "Failed to cast test volume to Azure test volume")
diskName := av.volumeName[(strings.LastIndex(av.volumeName, "/") + 1):] diskName := av.volumeName[(strings.LastIndex(av.volumeName, "/") + 1):]
@ -1491,7 +1491,7 @@ func (a *azureDriver) GetPersistentVolumeSource(readOnly bool, fsType string, vo
return &pvSource, nil return &pvSource, nil
} }
func (a *azureDriver) GetDynamicProvisionStorageClass(config *testsuites.PerTestConfig, fsType string) *storagev1.StorageClass { func (a *azureDiskDriver) GetDynamicProvisionStorageClass(config *testsuites.PerTestConfig, fsType string) *storagev1.StorageClass {
provisioner := "kubernetes.io/azure-disk" provisioner := "kubernetes.io/azure-disk"
parameters := map[string]string{} parameters := map[string]string{}
if fsType != "" { if fsType != "" {
@ -1503,7 +1503,7 @@ func (a *azureDriver) GetDynamicProvisionStorageClass(config *testsuites.PerTest
return testsuites.GetStorageClass(provisioner, parameters, nil, ns, suffix) return testsuites.GetStorageClass(provisioner, parameters, nil, ns, suffix)
} }
func (a *azureDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTestConfig, func()) { func (a *azureDiskDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTestConfig, func()) {
return &testsuites.PerTestConfig{ return &testsuites.PerTestConfig{
Driver: a, Driver: a,
Prefix: "azure", Prefix: "azure",
@ -1511,7 +1511,7 @@ func (a *azureDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTestCo
}, func() {} }, func() {}
} }
func (a *azureDriver) CreateVolume(config *testsuites.PerTestConfig, volType testpatterns.TestVolType) testsuites.TestVolume { func (a *azureDiskDriver) CreateVolume(config *testsuites.PerTestConfig, volType testpatterns.TestVolType) testsuites.TestVolume {
ginkgo.By("creating a test azure disk volume") ginkgo.By("creating a test azure disk volume")
if volType == testpatterns.InlineVolume { if volType == testpatterns.InlineVolume {
// Volume will be created in framework.TestContext.CloudConfig.Zone zone, // Volume will be created in framework.TestContext.CloudConfig.Zone zone,
@ -1522,12 +1522,12 @@ func (a *azureDriver) CreateVolume(config *testsuites.PerTestConfig, volType tes
} }
volumeName, err := e2epv.CreatePDWithRetry() volumeName, err := e2epv.CreatePDWithRetry()
framework.ExpectNoError(err) framework.ExpectNoError(err)
return &azureVolume{ return &azureDiskVolume{
volumeName: volumeName, volumeName: volumeName,
} }
} }
func (v *azureVolume) DeleteVolume() { func (v *azureDiskVolume) DeleteVolume() {
e2epv.DeletePDWithRetry(v.volumeName) e2epv.DeletePDWithRetry(v.volumeName)
} }

2
test/e2e/storage/in_tree_volumes.go
View File

@ -36,7 +36,7 @@ var testDrivers = []func() testsuites.TestDriver{
drivers.InitCinderDriver, drivers.InitCinderDriver,
drivers.InitGcePdDriver, drivers.InitGcePdDriver,
drivers.InitVSphereDriver, drivers.InitVSphereDriver,
drivers.InitAzureDriver, drivers.InitAzureDiskDriver,
drivers.InitAwsDriver, drivers.InitAwsDriver,
drivers.InitLocalDriverWithVolumeType(utils.LocalVolumeDirectory), drivers.InitLocalDriverWithVolumeType(utils.LocalVolumeDirectory),
drivers.InitLocalDriverWithVolumeType(utils.LocalVolumeDirectoryLink), drivers.InitLocalDriverWithVolumeType(utils.LocalVolumeDirectoryLink),