mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #85426 from davidz627/fix/testCtx
Plumb test state through to fake volume host creation for error handling
This commit is contained in:
commit
300ca89e60
@ -122,7 +122,7 @@ func Test_AddPodToVolume_Positive_ExistingPodExistingVolume(t *testing.T) {
|
|||||||
// Verities generated names are different for different pods if volume is not device mountble and attachable
|
// Verities generated names are different for different pods if volume is not device mountble and attachable
|
||||||
func Test_AddPodToVolume_Positive_NamesForDifferentPodsAndDifferentVolumes(t *testing.T) {
|
func Test_AddPodToVolume_Positive_NamesForDifferentPodsAndDifferentVolumes(t *testing.T) {
|
||||||
// Arrange
|
// Arrange
|
||||||
fakeVolumeHost := volumetesting.NewFakeVolumeHost(
|
fakeVolumeHost := volumetesting.NewFakeVolumeHost(t,
|
||||||
"", /* rootDir */
|
"", /* rootDir */
|
||||||
nil, /* kubeClient */
|
nil, /* kubeClient */
|
||||||
nil, /* plugins */
|
nil, /* plugins */
|
||||||
|
@ -111,7 +111,7 @@ func TestGetMountedVolumesForPodAndGetVolumesInUse(t *testing.T) {
|
|||||||
node, pod, pv, claim := createObjects(test.pvMode, test.podMode)
|
node, pod, pv, claim := createObjects(test.pvMode, test.podMode)
|
||||||
kubeClient := fake.NewSimpleClientset(node, pod, pv, claim)
|
kubeClient := fake.NewSimpleClientset(node, pod, pv, claim)
|
||||||
|
|
||||||
manager := newTestVolumeManager(tmpDir, podManager, kubeClient)
|
manager := newTestVolumeManager(t, tmpDir, podManager, kubeClient)
|
||||||
|
|
||||||
stopCh := runVolumeManager(manager)
|
stopCh := runVolumeManager(manager)
|
||||||
defer close(stopCh)
|
defer close(stopCh)
|
||||||
@ -172,7 +172,7 @@ func TestInitialPendingVolumesForPodAndGetVolumesInUse(t *testing.T) {
|
|||||||
|
|
||||||
kubeClient := fake.NewSimpleClientset(node, pod, pv, claim)
|
kubeClient := fake.NewSimpleClientset(node, pod, pv, claim)
|
||||||
|
|
||||||
manager := newTestVolumeManager(tmpDir, podManager, kubeClient)
|
manager := newTestVolumeManager(t, tmpDir, podManager, kubeClient)
|
||||||
|
|
||||||
stopCh := runVolumeManager(manager)
|
stopCh := runVolumeManager(manager)
|
||||||
defer close(stopCh)
|
defer close(stopCh)
|
||||||
@ -261,7 +261,7 @@ func TestGetExtraSupplementalGroupsForPod(t *testing.T) {
|
|||||||
}
|
}
|
||||||
kubeClient := fake.NewSimpleClientset(node, pod, pv, claim)
|
kubeClient := fake.NewSimpleClientset(node, pod, pv, claim)
|
||||||
|
|
||||||
manager := newTestVolumeManager(tmpDir, podManager, kubeClient)
|
manager := newTestVolumeManager(t, tmpDir, podManager, kubeClient)
|
||||||
|
|
||||||
stopCh := runVolumeManager(manager)
|
stopCh := runVolumeManager(manager)
|
||||||
defer close(stopCh)
|
defer close(stopCh)
|
||||||
@ -287,12 +287,12 @@ func TestGetExtraSupplementalGroupsForPod(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func newTestVolumeManager(tmpDir string, podManager kubepod.Manager, kubeClient clientset.Interface) VolumeManager {
|
func newTestVolumeManager(t *testing.T, tmpDir string, podManager kubepod.Manager, kubeClient clientset.Interface) VolumeManager {
|
||||||
plug := &volumetest.FakeVolumePlugin{PluginName: "fake", Host: nil}
|
plug := &volumetest.FakeVolumePlugin{PluginName: "fake", Host: nil}
|
||||||
fakeRecorder := &record.FakeRecorder{}
|
fakeRecorder := &record.FakeRecorder{}
|
||||||
plugMgr := &volume.VolumePluginMgr{}
|
plugMgr := &volume.VolumePluginMgr{}
|
||||||
// TODO (#51147) inject mock prober
|
// TODO (#51147) inject mock prober
|
||||||
plugMgr.InitPlugins([]volume.VolumePlugin{plug}, nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, kubeClient, nil))
|
plugMgr.InitPlugins([]volume.VolumePlugin{plug}, nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, kubeClient, nil))
|
||||||
statusManager := status.NewManager(kubeClient, podManager, &statustest.FakePodDeletionSafetyProvider{})
|
statusManager := status.NewManager(kubeClient, podManager, &statustest.FakePodDeletionSafetyProvider{})
|
||||||
fakePathHandler := volumetest.NewBlockVolumePathHandler()
|
fakePathHandler := volumetest.NewBlockVolumePathHandler()
|
||||||
vm := NewVolumeManager(
|
vm := NewVolumeManager(
|
||||||
|
@ -33,7 +33,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestGetVolumeName_Volume(t *testing.T) {
|
func TestGetVolumeName_Volume(t *testing.T) {
|
||||||
plugin := newPlugin()
|
plugin := newPlugin(t)
|
||||||
name := aws.KubernetesVolumeID("my-aws-volume")
|
name := aws.KubernetesVolumeID("my-aws-volume")
|
||||||
spec := createVolSpec(name, false)
|
spec := createVolSpec(name, false)
|
||||||
|
|
||||||
@ -47,7 +47,7 @@ func TestGetVolumeName_Volume(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestGetVolumeName_PersistentVolume(t *testing.T) {
|
func TestGetVolumeName_PersistentVolume(t *testing.T) {
|
||||||
plugin := newPlugin()
|
plugin := newPlugin(t)
|
||||||
name := aws.KubernetesVolumeID("my-aws-pv")
|
name := aws.KubernetesVolumeID("my-aws-pv")
|
||||||
spec := createPVSpec(name, true)
|
spec := createPVSpec(name, true)
|
||||||
|
|
||||||
@ -142,8 +142,8 @@ func TestAttachDetach(t *testing.T) {
|
|||||||
|
|
||||||
// newPlugin creates a new gcePersistentDiskPlugin with fake cloud, NewAttacher
|
// newPlugin creates a new gcePersistentDiskPlugin with fake cloud, NewAttacher
|
||||||
// and NewDetacher won't work.
|
// and NewDetacher won't work.
|
||||||
func newPlugin() *awsElasticBlockStorePlugin {
|
func newPlugin(t *testing.T) *awsElasticBlockStorePlugin {
|
||||||
host := volumetest.NewFakeVolumeHost("/tmp", nil, nil)
|
host := volumetest.NewFakeVolumeHost(t, "/tmp", nil, nil)
|
||||||
plugins := ProbeVolumePlugins()
|
plugins := ProbeVolumePlugins()
|
||||||
plugin := plugins[0]
|
plugin := plugins[0]
|
||||||
plugin.Init(host)
|
plugin.Init(host)
|
||||||
|
@ -52,7 +52,7 @@ func TestGetVolumeSpecFromGlobalMapPath(t *testing.T) {
|
|||||||
expectedGlobalPath := filepath.Join(tmpVDir, testGlobalPath)
|
expectedGlobalPath := filepath.Join(tmpVDir, testGlobalPath)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpVDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpVDir, nil, nil))
|
||||||
plug, err := plugMgr.FindMapperPluginByName(awsElasticBlockStorePluginName)
|
plug, err := plugMgr.FindMapperPluginByName(awsElasticBlockStorePluginName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
os.RemoveAll(tmpVDir)
|
os.RemoveAll(tmpVDir)
|
||||||
@ -120,7 +120,7 @@ func TestGetPodAndPluginMapPaths(t *testing.T) {
|
|||||||
|
|
||||||
spec := getTestVolume(false, true /*isBlock*/)
|
spec := getTestVolume(false, true /*isBlock*/)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpVDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpVDir, nil, nil))
|
||||||
plug, err := plugMgr.FindMapperPluginByName(awsElasticBlockStorePluginName)
|
plug, err := plugMgr.FindMapperPluginByName(awsElasticBlockStorePluginName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
os.RemoveAll(tmpVDir)
|
os.RemoveAll(tmpVDir)
|
||||||
|
@ -46,7 +46,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/aws-ebs")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/aws-ebs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -70,7 +70,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/aws-ebs")
|
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/aws-ebs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -110,7 +110,7 @@ func TestPlugin(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/aws-ebs")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/aws-ebs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -279,7 +279,7 @@ func TestPersistentClaimReadOnlyFlag(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, clientset, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, clientset, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName(awsElasticBlockStorePluginName)
|
plug, _ := plugMgr.FindPluginByName(awsElasticBlockStorePluginName)
|
||||||
|
|
||||||
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
||||||
@ -299,7 +299,7 @@ func TestMounterAndUnmounterTypeAssert(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/aws-ebs")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/aws-ebs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -339,7 +339,7 @@ func TestMountOptions(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/aws-ebs")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/aws-ebs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -109,7 +109,7 @@ func TestGetPodAndPluginMapPaths(t *testing.T) {
|
|||||||
|
|
||||||
spec := getTestVolume(false, tmpVDir, true /*isBlock*/)
|
spec := getTestVolume(false, tmpVDir, true /*isBlock*/)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpVDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpVDir, nil, nil))
|
||||||
plug, err := plugMgr.FindMapperPluginByName(azureDataDiskPluginName)
|
plug, err := plugMgr.FindMapperPluginByName(azureDataDiskPluginName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
os.RemoveAll(tmpVDir)
|
os.RemoveAll(tmpVDir)
|
||||||
|
@ -37,7 +37,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName(azureDataDiskPluginName)
|
plug, err := plugMgr.FindPluginByName(azureDataDiskPluginName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -47,7 +47,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/azure-file")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/azure-file")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -71,7 +71,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/azure-file")
|
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/azure-file")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -106,20 +106,20 @@ func getTestTempDir(t *testing.T) string {
|
|||||||
func TestPluginAzureCloudProvider(t *testing.T) {
|
func TestPluginAzureCloudProvider(t *testing.T) {
|
||||||
tmpDir := getTestTempDir(t)
|
tmpDir := getTestTempDir(t)
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
testPlugin(t, tmpDir, volumetest.NewFakeVolumeHostWithCloudProvider(tmpDir, nil, nil, getAzureTestCloud(t)))
|
testPlugin(t, tmpDir, volumetest.NewFakeVolumeHostWithCloudProvider(t, tmpDir, nil, nil, getAzureTestCloud(t)))
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestPluginWithoutCloudProvider(t *testing.T) {
|
func TestPluginWithoutCloudProvider(t *testing.T) {
|
||||||
tmpDir := getTestTempDir(t)
|
tmpDir := getTestTempDir(t)
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
testPlugin(t, tmpDir, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
testPlugin(t, tmpDir, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestPluginWithOtherCloudProvider(t *testing.T) {
|
func TestPluginWithOtherCloudProvider(t *testing.T) {
|
||||||
tmpDir := getTestTempDir(t)
|
tmpDir := getTestTempDir(t)
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
cloud := &fakecloud.Cloud{}
|
cloud := &fakecloud.Cloud{}
|
||||||
testPlugin(t, tmpDir, volumetest.NewFakeVolumeHostWithCloudProvider(tmpDir, nil, nil, cloud))
|
testPlugin(t, tmpDir, volumetest.NewFakeVolumeHostWithCloudProvider(t, tmpDir, nil, nil, cloud))
|
||||||
}
|
}
|
||||||
|
|
||||||
func testPlugin(t *testing.T, tmpDir string, volumeHost volume.VolumeHost) {
|
func testPlugin(t *testing.T, tmpDir string, volumeHost volume.VolumeHost) {
|
||||||
@ -214,7 +214,7 @@ func TestPersistentClaimReadOnlyFlag(t *testing.T) {
|
|||||||
client := fake.NewSimpleClientset(pv, claim)
|
client := fake.NewSimpleClientset(pv, claim)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost("/tmp/fake", client, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, "/tmp/fake", client, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName(azureFilePluginName)
|
plug, _ := plugMgr.FindPluginByName(azureFilePluginName)
|
||||||
|
|
||||||
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
||||||
@ -246,7 +246,7 @@ func TestMounterAndUnmounterTypeAssert(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/azure-file")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/azure-file")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -37,7 +37,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/cephfs")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/cephfs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Can't find the plugin by name")
|
t.Errorf("Can't find the plugin by name")
|
||||||
@ -60,7 +60,7 @@ func TestPlugin(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/cephfs")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/cephfs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Can't find the plugin by name")
|
t.Errorf("Can't find the plugin by name")
|
||||||
@ -122,7 +122,7 @@ func TestConstructVolumeSpec(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/cephfs")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/cephfs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("can't find cephfs plugin by name")
|
t.Errorf("can't find cephfs plugin by name")
|
||||||
@ -236,7 +236,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/cephfs")
|
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/cephfs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -24,7 +24,7 @@ import (
|
|||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
"k8s.io/apimachinery/pkg/api/resource"
|
"k8s.io/apimachinery/pkg/api/resource"
|
||||||
cloudprovider "k8s.io/cloud-provider"
|
cloudprovider "k8s.io/cloud-provider"
|
||||||
"k8s.io/kubernetes/pkg/volume"
|
"k8s.io/kubernetes/pkg/volume"
|
||||||
@ -46,7 +46,7 @@ var attachStatus = "Attach"
|
|||||||
var detachStatus = "Detach"
|
var detachStatus = "Detach"
|
||||||
|
|
||||||
func TestGetDeviceName_Volume(t *testing.T) {
|
func TestGetDeviceName_Volume(t *testing.T) {
|
||||||
plugin := newPlugin()
|
plugin := newPlugin(t)
|
||||||
name := "my-cinder-volume"
|
name := "my-cinder-volume"
|
||||||
spec := createVolSpec(name, false)
|
spec := createVolSpec(name, false)
|
||||||
|
|
||||||
@ -60,7 +60,7 @@ func TestGetDeviceName_Volume(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestGetDeviceName_PersistentVolume(t *testing.T) {
|
func TestGetDeviceName_PersistentVolume(t *testing.T) {
|
||||||
plugin := newPlugin()
|
plugin := newPlugin(t)
|
||||||
name := "my-cinder-pv"
|
name := "my-cinder-pv"
|
||||||
spec := createPVSpec(name, true)
|
spec := createPVSpec(name, true)
|
||||||
|
|
||||||
@ -77,7 +77,7 @@ func TestGetDeviceMountPath(t *testing.T) {
|
|||||||
name := "cinder-volume-id"
|
name := "cinder-volume-id"
|
||||||
spec := createVolSpec(name, false)
|
spec := createVolSpec(name, false)
|
||||||
rootDir := "/var/lib/kubelet/"
|
rootDir := "/var/lib/kubelet/"
|
||||||
host := volumetest.NewFakeVolumeHost(rootDir, nil, nil)
|
host := volumetest.NewFakeVolumeHost(t, rootDir, nil, nil)
|
||||||
|
|
||||||
attacher := &cinderDiskAttacher{
|
attacher := &cinderDiskAttacher{
|
||||||
host: host,
|
host: host,
|
||||||
@ -355,8 +355,8 @@ func serializeAttachments(attachments map[*volume.Spec]bool) string {
|
|||||||
|
|
||||||
// newPlugin creates a new gcePersistentDiskPlugin with fake cloud, NewAttacher
|
// newPlugin creates a new gcePersistentDiskPlugin with fake cloud, NewAttacher
|
||||||
// and NewDetacher won't work.
|
// and NewDetacher won't work.
|
||||||
func newPlugin() *cinderPlugin {
|
func newPlugin(t *testing.T) *cinderPlugin {
|
||||||
host := volumetest.NewFakeVolumeHost("/tmp", nil, nil)
|
host := volumetest.NewFakeVolumeHost(t, "/tmp", nil, nil)
|
||||||
plugins := ProbeVolumePlugins()
|
plugins := ProbeVolumePlugins()
|
||||||
plugin := plugins[0]
|
plugin := plugins[0]
|
||||||
plugin.Init(host)
|
plugin.Init(host)
|
||||||
|
@ -112,7 +112,7 @@ func TestGetPodAndPluginMapPaths(t *testing.T) {
|
|||||||
|
|
||||||
spec := getTestVolume(false, true /*isBlock*/)
|
spec := getTestVolume(false, true /*isBlock*/)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpVDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpVDir, nil, nil))
|
||||||
plug, err := plugMgr.FindMapperPluginByName(cinderVolumePluginName)
|
plug, err := plugMgr.FindMapperPluginByName(cinderVolumePluginName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
os.RemoveAll(tmpVDir)
|
os.RemoveAll(tmpVDir)
|
||||||
|
@ -43,7 +43,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/cinder")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/cinder")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -141,7 +141,7 @@ func TestPlugin(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/cinder")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/cinder")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -280,7 +280,7 @@ func TestGetVolumeLimit(t *testing.T) {
|
|||||||
|
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
volumeHost := volumetest.NewFakeVolumeHostWithCloudProvider(tmpDir, nil, nil, cloud)
|
volumeHost := volumetest.NewFakeVolumeHostWithCloudProvider(t, tmpDir, nil, nil, cloud)
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumeHost)
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumeHost)
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/cinder")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/cinder")
|
||||||
|
@ -297,7 +297,7 @@ func newTestHost(t *testing.T, clientset clientset.Interface) (string, volume.Vo
|
|||||||
t.Fatalf("can't make a temp rootdir: %v", err)
|
t.Fatalf("can't make a temp rootdir: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return tempDir, volumetest.NewFakeVolumeHost(tempDir, clientset, emptydir.ProbeVolumePlugins())
|
return tempDir, volumetest.NewFakeVolumeHost(t, tempDir, clientset, emptydir.ProbeVolumePlugins())
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCanSupport(t *testing.T) {
|
func TestCanSupport(t *testing.T) {
|
||||||
|
@ -1514,7 +1514,7 @@ func newTestWatchPlugin(t *testing.T, fakeClient *fakeclient.Clientset) (*csiPlu
|
|||||||
csiDriverLister := csiDriverInformer.Lister()
|
csiDriverLister := csiDriverInformer.Lister()
|
||||||
factory.Start(wait.NeverStop)
|
factory.Start(wait.NeverStop)
|
||||||
|
|
||||||
host := volumetest.NewFakeVolumeHostWithCSINodeName(
|
host := volumetest.NewFakeVolumeHostWithCSINodeName(t,
|
||||||
tmpDir,
|
tmpDir,
|
||||||
fakeClient,
|
fakeClient,
|
||||||
ProbeVolumePlugins(),
|
ProbeVolumePlugins(),
|
||||||
|
@ -65,7 +65,7 @@ func newTestPlugin(t *testing.T, client *fakeclient.Clientset) (*csiPlugin, stri
|
|||||||
csiDriverLister := csiDriverInformer.Lister()
|
csiDriverLister := csiDriverInformer.Lister()
|
||||||
go factory.Start(wait.NeverStop)
|
go factory.Start(wait.NeverStop)
|
||||||
|
|
||||||
host := volumetest.NewFakeVolumeHostWithCSINodeName(
|
host := volumetest.NewFakeVolumeHostWithCSINodeName(t,
|
||||||
tmpDir,
|
tmpDir,
|
||||||
client,
|
client,
|
||||||
ProbeVolumePlugins(),
|
ProbeVolumePlugins(),
|
||||||
@ -1016,7 +1016,7 @@ func TestPluginFindAttachablePlugin(t *testing.T) {
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
factory := informers.NewSharedInformerFactory(client, CsiResyncPeriod)
|
factory := informers.NewSharedInformerFactory(client, CsiResyncPeriod)
|
||||||
host := volumetest.NewFakeVolumeHostWithCSINodeName(
|
host := volumetest.NewFakeVolumeHostWithCSINodeName(t,
|
||||||
tmpDir,
|
tmpDir,
|
||||||
client,
|
client,
|
||||||
ProbeVolumePlugins(),
|
ProbeVolumePlugins(),
|
||||||
@ -1141,9 +1141,8 @@ func TestPluginFindDeviceMountablePluginBySpec(t *testing.T) {
|
|||||||
Spec: v1.NodeSpec{},
|
Spec: v1.NodeSpec{},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
host := volumetest.NewFakeVolumeHostWithCSINodeName(tmpDir, client, ProbeVolumePlugins(), "fakeNode", nil)
|
host := volumetest.NewFakeVolumeHostWithCSINodeName(t, tmpDir, client, ProbeVolumePlugins(), "fakeNode", nil)
|
||||||
plugMgr := host.GetPluginMgr()
|
plugMgr := host.GetPluginMgr()
|
||||||
|
|
||||||
plug, err := plugMgr.FindDeviceMountablePluginBySpec(test.spec)
|
plug, err := plugMgr.FindDeviceMountablePluginBySpec(test.spec)
|
||||||
if err != nil && !test.shouldFail {
|
if err != nil && !test.shouldFail {
|
||||||
t.Fatalf("unexpected error in plugMgr.FindDeviceMountablePluginBySpec: %s", err)
|
t.Fatalf("unexpected error in plugMgr.FindDeviceMountablePluginBySpec: %s", err)
|
||||||
|
@ -257,7 +257,7 @@ func TestCSI_VolumeAll(t *testing.T) {
|
|||||||
}
|
}
|
||||||
factory.Start(wait.NeverStop)
|
factory.Start(wait.NeverStop)
|
||||||
|
|
||||||
host := volumetest.NewFakeVolumeHostWithCSINodeName(
|
host := volumetest.NewFakeVolumeHostWithCSINodeName(t,
|
||||||
tmpDir,
|
tmpDir,
|
||||||
client,
|
client,
|
||||||
ProbeVolumePlugins(),
|
ProbeVolumePlugins(),
|
||||||
|
@ -962,7 +962,7 @@ func TestInstallCSIDriverExistingAnnotation(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("can't create temp dir: %v", err)
|
t.Fatalf("can't create temp dir: %v", err)
|
||||||
}
|
}
|
||||||
host := volumetest.NewFakeVolumeHostWithCSINodeName(
|
host := volumetest.NewFakeVolumeHostWithCSINodeName(t,
|
||||||
tmpDir,
|
tmpDir,
|
||||||
client,
|
client,
|
||||||
nil,
|
nil,
|
||||||
@ -1023,7 +1023,7 @@ func test(t *testing.T, addNodeInfo bool, csiNodeInfoEnabled bool, testcases []t
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("can't create temp dir: %v", err)
|
t.Fatalf("can't create temp dir: %v", err)
|
||||||
}
|
}
|
||||||
host := volumetest.NewFakeVolumeHostWithCSINodeName(
|
host := volumetest.NewFakeVolumeHostWithCSINodeName(t,
|
||||||
tmpDir,
|
tmpDir,
|
||||||
client,
|
client,
|
||||||
nil,
|
nil,
|
||||||
|
@ -56,7 +56,7 @@ func NewTestPlugin(t *testing.T, client *fakeclient.Clientset) (*volume.VolumePl
|
|||||||
csiDriverLister := csiDriverInformer.Lister()
|
csiDriverLister := csiDriverInformer.Lister()
|
||||||
go factory.Start(wait.NeverStop)
|
go factory.Start(wait.NeverStop)
|
||||||
|
|
||||||
host := volumetest.NewFakeVolumeHostWithCSINodeName(
|
host := volumetest.NewFakeVolumeHostWithCSINodeName(t,
|
||||||
tmpDir,
|
tmpDir,
|
||||||
client,
|
client,
|
||||||
csi.ProbeVolumePlugins(),
|
csi.ProbeVolumePlugins(),
|
||||||
|
@ -47,7 +47,7 @@ func newTestHost(t *testing.T, clientset clientset.Interface) (string, volume.Vo
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("can't make a temp rootdir: %v", err)
|
t.Fatalf("can't make a temp rootdir: %v", err)
|
||||||
}
|
}
|
||||||
return tempDir, volumetest.NewFakeVolumeHost(tempDir, clientset, emptydir.ProbeVolumePlugins())
|
return tempDir, volumetest.NewFakeVolumeHost(t, tempDir, clientset, emptydir.ProbeVolumePlugins())
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCanSupport(t *testing.T) {
|
func TestCanSupport(t *testing.T) {
|
||||||
|
@ -38,7 +38,7 @@ import (
|
|||||||
// Construct an instance of a plugin, by name.
|
// Construct an instance of a plugin, by name.
|
||||||
func makePluginUnderTest(t *testing.T, plugName, basePath string) volume.VolumePlugin {
|
func makePluginUnderTest(t *testing.T, plugName, basePath string) volume.VolumePlugin {
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(basePath, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, basePath, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName(plugName)
|
plug, err := plugMgr.FindPluginByName(plugName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -44,7 +44,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/fc")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/fc")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -81,7 +81,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/fc")
|
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/fc")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -157,7 +157,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/fc")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/fc")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -220,7 +220,7 @@ func doTestPluginNilMounter(t *testing.T, spec *volume.Spec) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/fc")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/fc")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -382,7 +382,7 @@ func TestPersistentClaimReadOnlyFlag(t *testing.T) {
|
|||||||
client := fake.NewSimpleClientset(pv, claim)
|
client := fake.NewSimpleClientset(pv, claim)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, client, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, client, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName(fcPluginName)
|
plug, _ := plugMgr.FindPluginByName(fcPluginName)
|
||||||
|
|
||||||
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
||||||
|
@ -19,12 +19,12 @@ package flexvolume
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
"k8s.io/kubernetes/pkg/volume"
|
"k8s.io/kubernetes/pkg/volume"
|
||||||
volumetesting "k8s.io/kubernetes/pkg/volume/testing"
|
volumetesting "k8s.io/kubernetes/pkg/volume/testing"
|
||||||
"k8s.io/kubernetes/test/utils/harness"
|
"k8s.io/kubernetes/test/utils/harness"
|
||||||
"k8s.io/utils/exec"
|
"k8s.io/utils/exec"
|
||||||
"k8s.io/utils/exec/testing"
|
exectesting "k8s.io/utils/exec/testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func testPlugin(h *harness.Harness) (*flexVolumeAttachablePlugin, string) {
|
func testPlugin(h *harness.Harness) (*flexVolumeAttachablePlugin, string) {
|
||||||
@ -33,13 +33,13 @@ func testPlugin(h *harness.Harness) (*flexVolumeAttachablePlugin, string) {
|
|||||||
flexVolumePlugin: &flexVolumePlugin{
|
flexVolumePlugin: &flexVolumePlugin{
|
||||||
driverName: "test",
|
driverName: "test",
|
||||||
execPath: "/plugin",
|
execPath: "/plugin",
|
||||||
host: volumetesting.NewFakeVolumeHost(rootDir, nil, nil),
|
host: volumetesting.NewFakeVolumeHost(h.T, rootDir, nil, nil),
|
||||||
unsupportedCommands: []string{},
|
unsupportedCommands: []string{},
|
||||||
},
|
},
|
||||||
}, rootDir
|
}, rootDir
|
||||||
}
|
}
|
||||||
|
|
||||||
func assertDriverCall(t *harness.Harness, output testingexec.FakeCombinedOutputAction, expectedCommand string, expectedArgs ...string) testingexec.FakeCommandAction {
|
func assertDriverCall(t *harness.Harness, output exectesting.FakeCombinedOutputAction, expectedCommand string, expectedArgs ...string) exectesting.FakeCommandAction {
|
||||||
return func(cmd string, args ...string) exec.Cmd {
|
return func(cmd string, args ...string) exec.Cmd {
|
||||||
if cmd != "/plugin/test" {
|
if cmd != "/plugin/test" {
|
||||||
t.Errorf("Wrong executable called: got %v, expected %v", cmd, "/plugin/test")
|
t.Errorf("Wrong executable called: got %v, expected %v", cmd, "/plugin/test")
|
||||||
@ -51,20 +51,20 @@ func assertDriverCall(t *harness.Harness, output testingexec.FakeCombinedOutputA
|
|||||||
if !sameArgs(cmdArgs, expectedArgs) {
|
if !sameArgs(cmdArgs, expectedArgs) {
|
||||||
t.Errorf("Wrong args for %s: got %v, expected %v", args[0], cmdArgs, expectedArgs)
|
t.Errorf("Wrong args for %s: got %v, expected %v", args[0], cmdArgs, expectedArgs)
|
||||||
}
|
}
|
||||||
return &testingexec.FakeCmd{
|
return &exectesting.FakeCmd{
|
||||||
Argv: args,
|
Argv: args,
|
||||||
CombinedOutputScript: []testingexec.FakeCombinedOutputAction{output},
|
CombinedOutputScript: []exectesting.FakeCombinedOutputAction{output},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func fakeRunner(fakeCommands ...testingexec.FakeCommandAction) exec.Interface {
|
func fakeRunner(fakeCommands ...exectesting.FakeCommandAction) exec.Interface {
|
||||||
return &testingexec.FakeExec{
|
return &exectesting.FakeExec{
|
||||||
CommandScript: fakeCommands,
|
CommandScript: fakeCommands,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func fakeResultOutput(result interface{}) testingexec.FakeCombinedOutputAction {
|
func fakeResultOutput(result interface{}) exectesting.FakeCombinedOutputAction {
|
||||||
return func() ([]byte, error) {
|
return func() ([]byte, error) {
|
||||||
bytes, err := json.Marshal(result)
|
bytes, err := json.Marshal(result)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -74,11 +74,11 @@ func fakeResultOutput(result interface{}) testingexec.FakeCombinedOutputAction {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func successOutput() testingexec.FakeCombinedOutputAction {
|
func successOutput() exectesting.FakeCombinedOutputAction {
|
||||||
return fakeResultOutput(&DriverStatus{StatusSuccess, "", "", "", true, nil, 0})
|
return fakeResultOutput(&DriverStatus{StatusSuccess, "", "", "", true, nil, 0})
|
||||||
}
|
}
|
||||||
|
|
||||||
func notSupportedOutput() testingexec.FakeCombinedOutputAction {
|
func notSupportedOutput() exectesting.FakeCombinedOutputAction {
|
||||||
return fakeResultOutput(&DriverStatus{StatusNotSupported, "", "", "", false, nil, 0})
|
return fakeResultOutput(&DriverStatus{StatusNotSupported, "", "", "", false, nil, 0})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -123,7 +123,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
runner := exec.New()
|
runner := exec.New()
|
||||||
installPluginUnderTest(t, "kubernetes.io", "fakeAttacher", tmpDir, execScriptTempl1, nil)
|
installPluginUnderTest(t, "kubernetes.io", "fakeAttacher", tmpDir, execScriptTempl1, nil)
|
||||||
plugMgr.InitPlugins(nil, GetDynamicPluginProber(tmpDir, runner), volumetest.NewFakeVolumeHost("fake", nil, nil))
|
plugMgr.InitPlugins(nil, GetDynamicPluginProber(tmpDir, runner), volumetest.NewFakeVolumeHost(t, "fake", nil, nil))
|
||||||
plugin, err := plugMgr.FindPluginByName("flexvolume-kubernetes.io/fakeAttacher")
|
plugin, err := plugMgr.FindPluginByName("flexvolume-kubernetes.io/fakeAttacher")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Can't find the plugin by name")
|
t.Fatalf("Can't find the plugin by name")
|
||||||
@ -152,7 +152,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
runner := exec.New()
|
runner := exec.New()
|
||||||
installPluginUnderTest(t, "kubernetes.io", "fakeAttacher", tmpDir, execScriptTempl1, nil)
|
installPluginUnderTest(t, "kubernetes.io", "fakeAttacher", tmpDir, execScriptTempl1, nil)
|
||||||
plugMgr.InitPlugins(nil, GetDynamicPluginProber(tmpDir, runner), volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(nil, GetDynamicPluginProber(tmpDir, runner), volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plugin, err := plugMgr.FindPersistentPluginByName("flexvolume-kubernetes.io/fakeAttacher")
|
plugin, err := plugMgr.FindPersistentPluginByName("flexvolume-kubernetes.io/fakeAttacher")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -127,7 +127,7 @@ func newInitializedVolumePlugMgr(t *testing.T) (*volume.VolumePluginMgr, string)
|
|||||||
plugMgr := &volume.VolumePluginMgr{}
|
plugMgr := &volume.VolumePluginMgr{}
|
||||||
dir, err := utiltesting.MkTmpdir("flocker")
|
dir, err := utiltesting.MkTmpdir("flocker")
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(dir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, dir, nil, nil))
|
||||||
return plugMgr, dir
|
return plugMgr, dir
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -138,7 +138,7 @@ func TestPlugin(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/flocker")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/flocker")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -21,7 +21,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
"k8s.io/kubernetes/pkg/volume"
|
"k8s.io/kubernetes/pkg/volume"
|
||||||
volumetest "k8s.io/kubernetes/pkg/volume/testing"
|
volumetest "k8s.io/kubernetes/pkg/volume/testing"
|
||||||
|
|
||||||
@ -39,7 +39,7 @@ func TestFlockerUtil_CreateVolume(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fakeFlockerClient := newFakeFlockerClient()
|
fakeFlockerClient := newFakeFlockerClient()
|
||||||
dir, p := newTestableProvisioner(assert, options)
|
dir, p := newTestableProvisioner(t, assert, options)
|
||||||
provisioner := p.(*flockerVolumeProvisioner)
|
provisioner := p.(*flockerVolumeProvisioner)
|
||||||
defer os.RemoveAll(dir)
|
defer os.RemoveAll(dir)
|
||||||
provisioner.flockerClient = fakeFlockerClient
|
provisioner.flockerClient = fakeFlockerClient
|
||||||
|
@ -21,7 +21,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
utiltesting "k8s.io/client-go/util/testing"
|
utiltesting "k8s.io/client-go/util/testing"
|
||||||
"k8s.io/kubernetes/pkg/volume"
|
"k8s.io/kubernetes/pkg/volume"
|
||||||
@ -30,12 +30,12 @@ import (
|
|||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func newTestableProvisioner(assert *assert.Assertions, options volume.VolumeOptions) (string, volume.Provisioner) {
|
func newTestableProvisioner(t *testing.T, assert *assert.Assertions, options volume.VolumeOptions) (string, volume.Provisioner) {
|
||||||
tmpDir, err := utiltesting.MkTmpdir("flockervolumeTest")
|
tmpDir, err := utiltesting.MkTmpdir("flockervolumeTest")
|
||||||
assert.NoError(err, fmt.Sprintf("can't make a temp dir: %v", err))
|
assert.NoError(err, fmt.Sprintf("can't make a temp dir: %v", err))
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName(pluginName)
|
plug, err := plugMgr.FindPluginByName(pluginName)
|
||||||
assert.NoError(err, "Can't find the plugin by name")
|
assert.NoError(err, "Can't find the plugin by name")
|
||||||
@ -54,7 +54,7 @@ func TestProvision(t *testing.T) {
|
|||||||
PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
|
PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
|
||||||
}
|
}
|
||||||
|
|
||||||
dir, provisioner := newTestableProvisioner(assert, options)
|
dir, provisioner := newTestableProvisioner(t, assert, options)
|
||||||
defer os.RemoveAll(dir)
|
defer os.RemoveAll(dir)
|
||||||
|
|
||||||
persistentSpec, err := provisioner.Provision(nil, nil)
|
persistentSpec, err := provisioner.Provision(nil, nil)
|
||||||
@ -83,7 +83,7 @@ func TestProvision(t *testing.T) {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
dir, provisioner = newTestableProvisioner(assert, options)
|
dir, provisioner = newTestableProvisioner(t, assert, options)
|
||||||
defer os.RemoveAll(dir)
|
defer os.RemoveAll(dir)
|
||||||
persistentSpec, err = provisioner.Provision(nil, nil)
|
persistentSpec, err = provisioner.Provision(nil, nil)
|
||||||
assert.Error(err, "Provision() did not fail with Parameters specified")
|
assert.Error(err, "Provision() did not fail with Parameters specified")
|
||||||
@ -95,7 +95,7 @@ func TestProvision(t *testing.T) {
|
|||||||
PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
|
PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
|
||||||
}
|
}
|
||||||
|
|
||||||
dir, provisioner = newTestableProvisioner(assert, options)
|
dir, provisioner = newTestableProvisioner(t, assert, options)
|
||||||
defer os.RemoveAll(dir)
|
defer os.RemoveAll(dir)
|
||||||
persistentSpec, err = provisioner.Provision(nil, nil)
|
persistentSpec, err = provisioner.Provision(nil, nil)
|
||||||
assert.Error(err, "Provision() did not fail with Selector specified")
|
assert.Error(err, "Provision() did not fail with Selector specified")
|
||||||
|
@ -38,7 +38,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestGetDeviceName_Volume(t *testing.T) {
|
func TestGetDeviceName_Volume(t *testing.T) {
|
||||||
plugin := newPlugin()
|
plugin := newPlugin(t)
|
||||||
name := "my-pd-volume"
|
name := "my-pd-volume"
|
||||||
spec := createVolSpec(name, false)
|
spec := createVolSpec(name, false)
|
||||||
|
|
||||||
@ -52,7 +52,7 @@ func TestGetDeviceName_Volume(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestGetDeviceName_PersistentVolume(t *testing.T) {
|
func TestGetDeviceName_PersistentVolume(t *testing.T) {
|
||||||
plugin := newPlugin()
|
plugin := newPlugin(t)
|
||||||
name := "my-pd-pv"
|
name := "my-pd-pv"
|
||||||
spec := createPVSpec(name, true, nil)
|
spec := createPVSpec(name, true, nil)
|
||||||
|
|
||||||
@ -402,8 +402,8 @@ func TestVerifyVolumesAttached(t *testing.T) {
|
|||||||
|
|
||||||
// newPlugin creates a new gcePersistentDiskPlugin with fake cloud, NewAttacher
|
// newPlugin creates a new gcePersistentDiskPlugin with fake cloud, NewAttacher
|
||||||
// and NewDetacher won't work.
|
// and NewDetacher won't work.
|
||||||
func newPlugin() *gcePersistentDiskPlugin {
|
func newPlugin(t *testing.T) *gcePersistentDiskPlugin {
|
||||||
host := volumetest.NewFakeVolumeHost(
|
host := volumetest.NewFakeVolumeHost(t,
|
||||||
"/tmp", /* rootDir */
|
"/tmp", /* rootDir */
|
||||||
nil, /* kubeClient */
|
nil, /* kubeClient */
|
||||||
nil, /* plugins */
|
nil, /* plugins */
|
||||||
|
@ -112,7 +112,7 @@ func TestGetPodAndPluginMapPaths(t *testing.T) {
|
|||||||
|
|
||||||
spec := getTestVolume(false, tmpVDir, true /*isBlock*/)
|
spec := getTestVolume(false, tmpVDir, true /*isBlock*/)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpVDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpVDir, nil, nil))
|
||||||
plug, err := plugMgr.FindMapperPluginByName(gcePersistentDiskPluginName)
|
plug, err := plugMgr.FindMapperPluginByName(gcePersistentDiskPluginName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
os.RemoveAll(tmpVDir)
|
os.RemoveAll(tmpVDir)
|
||||||
|
@ -45,7 +45,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/gce-pd")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/gce-pd")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -69,7 +69,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/gce-pd")
|
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/gce-pd")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -113,7 +113,7 @@ func TestPlugin(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/gce-pd")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/gce-pd")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -249,7 +249,7 @@ func TestMountOptions(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/gce-pd")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/gce-pd")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -328,7 +328,7 @@ func TestPersistentClaimReadOnlyFlag(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, client, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, client, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName(gcePersistentDiskPluginName)
|
plug, _ := plugMgr.FindPluginByName(gcePersistentDiskPluginName)
|
||||||
|
|
||||||
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
||||||
|
@ -40,7 +40,7 @@ func newTestHost(t *testing.T) (string, volume.VolumeHost) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("can't make a temp rootdir: %v", err)
|
t.Fatalf("can't make a temp rootdir: %v", err)
|
||||||
}
|
}
|
||||||
return tempDir, volumetest.NewFakeVolumeHost(tempDir, nil, emptydir.ProbeVolumePlugins())
|
return tempDir, volumetest.NewFakeVolumeHost(t, tempDir, nil, emptydir.ProbeVolumePlugins())
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCanSupport(t *testing.T) {
|
func TestCanSupport(t *testing.T) {
|
||||||
|
@ -44,7 +44,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/glusterfs")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/glusterfs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Can't find the plugin by name")
|
t.Errorf("Can't find the plugin by name")
|
||||||
@ -80,7 +80,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/glusterfs")
|
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/glusterfs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -99,7 +99,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/glusterfs")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/glusterfs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Can't find the plugin by name")
|
t.Errorf("Can't find the plugin by name")
|
||||||
@ -217,7 +217,7 @@ func TestPersistentClaimReadOnlyFlag(t *testing.T) {
|
|||||||
client := fake.NewSimpleClientset(pv, claim, ep)
|
client := fake.NewSimpleClientset(pv, claim, ep)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, client, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, client, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName(glusterfsPluginName)
|
plug, _ := plugMgr.FindPluginByName(glusterfsPluginName)
|
||||||
|
|
||||||
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
||||||
|
@ -50,7 +50,7 @@ func newHostPathTypeList(pathType ...string) []*v1.HostPathType {
|
|||||||
|
|
||||||
func TestCanSupport(t *testing.T) {
|
func TestCanSupport(t *testing.T) {
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost("fake", nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(t, "fake", nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/host-path")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/host-path")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -72,7 +72,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
|
|
||||||
func TestGetAccessModes(t *testing.T) {
|
func TestGetAccessModes(t *testing.T) {
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost("/tmp/fake", nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(t, "/tmp/fake", nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/host-path")
|
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/host-path")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -85,7 +85,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
|
|
||||||
func TestRecycler(t *testing.T) {
|
func TestRecycler(t *testing.T) {
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
pluginHost := volumetest.NewFakeVolumeHost("/tmp/fake", nil, nil)
|
pluginHost := volumetest.NewFakeVolumeHost(t, "/tmp/fake", nil, nil)
|
||||||
plugMgr.InitPlugins([]volume.VolumePlugin{&hostPathPlugin{nil, volume.VolumeConfig{}}}, nil, pluginHost)
|
plugMgr.InitPlugins([]volume.VolumePlugin{&hostPathPlugin{nil, volume.VolumeConfig{}}}, nil, pluginHost)
|
||||||
|
|
||||||
spec := &volume.Spec{PersistentVolume: &v1.PersistentVolume{Spec: v1.PersistentVolumeSpec{PersistentVolumeSource: v1.PersistentVolumeSource{HostPath: &v1.HostPathVolumeSource{Path: "/foo"}}}}}
|
spec := &volume.Spec{PersistentVolume: &v1.PersistentVolume{Spec: v1.PersistentVolumeSpec{PersistentVolumeSource: v1.PersistentVolumeSource{HostPath: &v1.HostPathVolumeSource{Path: "/foo"}}}}}
|
||||||
@ -104,7 +104,7 @@ func TestDeleter(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tempPath)
|
defer os.RemoveAll(tempPath)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost("/tmp/fake", nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(t, "/tmp/fake", nil, nil))
|
||||||
|
|
||||||
spec := &volume.Spec{PersistentVolume: &v1.PersistentVolume{Spec: v1.PersistentVolumeSpec{PersistentVolumeSource: v1.PersistentVolumeSource{HostPath: &v1.HostPathVolumeSource{Path: tempPath}}}}}
|
spec := &volume.Spec{PersistentVolume: &v1.PersistentVolume{Spec: v1.PersistentVolumeSpec{PersistentVolumeSource: v1.PersistentVolumeSource{HostPath: &v1.HostPathVolumeSource{Path: tempPath}}}}}
|
||||||
plug, err := plugMgr.FindDeletablePluginBySpec(spec)
|
plug, err := plugMgr.FindDeletablePluginBySpec(spec)
|
||||||
@ -138,7 +138,7 @@ func TestDeleterTempDir(t *testing.T) {
|
|||||||
|
|
||||||
for name, test := range tests {
|
for name, test := range tests {
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost("/tmp/fake", nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(t, "/tmp/fake", nil, nil))
|
||||||
spec := &volume.Spec{PersistentVolume: &v1.PersistentVolume{Spec: v1.PersistentVolumeSpec{PersistentVolumeSource: v1.PersistentVolumeSource{HostPath: &v1.HostPathVolumeSource{Path: test.path}}}}}
|
spec := &volume.Spec{PersistentVolume: &v1.PersistentVolume{Spec: v1.PersistentVolumeSpec{PersistentVolumeSource: v1.PersistentVolumeSource{HostPath: &v1.HostPathVolumeSource{Path: test.path}}}}}
|
||||||
plug, _ := plugMgr.FindDeletablePluginBySpec(spec)
|
plug, _ := plugMgr.FindDeletablePluginBySpec(spec)
|
||||||
deleter, _ := plug.NewDeleter(spec)
|
deleter, _ := plug.NewDeleter(spec)
|
||||||
@ -156,7 +156,7 @@ func TestProvisioner(t *testing.T) {
|
|||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{ProvisioningEnabled: true}),
|
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{ProvisioningEnabled: true}),
|
||||||
nil,
|
nil,
|
||||||
volumetest.NewFakeVolumeHost("/tmp/fake", nil, nil))
|
volumetest.NewFakeVolumeHost(t, "/tmp/fake", nil, nil))
|
||||||
spec := &volume.Spec{PersistentVolume: &v1.PersistentVolume{Spec: v1.PersistentVolumeSpec{
|
spec := &volume.Spec{PersistentVolume: &v1.PersistentVolume{Spec: v1.PersistentVolumeSpec{
|
||||||
PersistentVolumeSource: v1.PersistentVolumeSource{HostPath: &v1.HostPathVolumeSource{Path: fmt.Sprintf("/tmp/hostpath.%s", uuid.NewUUID())}}}}}
|
PersistentVolumeSource: v1.PersistentVolumeSource{HostPath: &v1.HostPathVolumeSource{Path: fmt.Sprintf("/tmp/hostpath.%s", uuid.NewUUID())}}}}}
|
||||||
plug, err := plugMgr.FindCreatablePluginBySpec(spec)
|
plug, err := plugMgr.FindCreatablePluginBySpec(spec)
|
||||||
@ -203,7 +203,7 @@ func TestProvisioner(t *testing.T) {
|
|||||||
|
|
||||||
func TestInvalidHostPath(t *testing.T) {
|
func TestInvalidHostPath(t *testing.T) {
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost("fake", nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(t, "fake", nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName(hostPathPluginName)
|
plug, err := plugMgr.FindPluginByName(hostPathPluginName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -228,7 +228,7 @@ func TestInvalidHostPath(t *testing.T) {
|
|||||||
|
|
||||||
func TestPlugin(t *testing.T) {
|
func TestPlugin(t *testing.T) {
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost("fake", nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(t, "fake", nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/host-path")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/host-path")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -304,7 +304,7 @@ func TestPersistentClaimReadOnlyFlag(t *testing.T) {
|
|||||||
client := fake.NewSimpleClientset(pv, claim)
|
client := fake.NewSimpleClientset(pv, claim)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost("/tmp/fake", client, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(t, "/tmp/fake", client, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName(hostPathPluginName)
|
plug, _ := plugMgr.FindPluginByName(hostPathPluginName)
|
||||||
|
|
||||||
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
||||||
|
@ -42,7 +42,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/iscsi")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/iscsi")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -79,7 +79,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/iscsi")
|
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/iscsi")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -153,7 +153,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/iscsi")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/iscsi")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -284,7 +284,7 @@ func TestPersistentClaimReadOnlyFlag(t *testing.T) {
|
|||||||
client := fake.NewSimpleClientset(pv, claim)
|
client := fake.NewSimpleClientset(pv, claim)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, client, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, client, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName(iscsiPluginName)
|
plug, _ := plugMgr.FindPluginByName(iscsiPluginName)
|
||||||
|
|
||||||
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
||||||
|
@ -51,7 +51,7 @@ func getPlugin(t *testing.T) (string, volume.VolumePlugin) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName(localVolumePluginName)
|
plug, err := plugMgr.FindPluginByName(localVolumePluginName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -71,7 +71,7 @@ func getBlockPlugin(t *testing.T) (string, volume.BlockVolumePlugin) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
plug, err := plugMgr.FindMapperPluginByName(localVolumePluginName)
|
plug, err := plugMgr.FindMapperPluginByName(localVolumePluginName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
os.RemoveAll(tmpDir)
|
os.RemoveAll(tmpDir)
|
||||||
@ -90,7 +90,7 @@ func getPersistentPlugin(t *testing.T) (string, volume.PersistentVolumePlugin) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName(localVolumePluginName)
|
plug, err := plugMgr.FindPersistentPluginByName(localVolumePluginName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -117,7 +117,7 @@ func getDeviceMountablePluginWithBlockPath(t *testing.T, isBlockDevice bool) (st
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHostWithMounterFSType(tmpDir, nil, nil, pathToFSType))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHostWithMounterFSType(t, tmpDir, nil, nil, pathToFSType))
|
||||||
|
|
||||||
plug, err := plugMgr.FindDeviceMountablePluginByName(localVolumePluginName)
|
plug, err := plugMgr.FindDeviceMountablePluginByName(localVolumePluginName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -475,7 +475,7 @@ func TestConstructVolumeSpec(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plug := &localVolumePlugin{
|
plug := &localVolumePlugin{
|
||||||
host: volumetest.NewFakeVolumeHost(tmpDir, nil, nil),
|
host: volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil),
|
||||||
}
|
}
|
||||||
mounter := plug.host.GetMounter(plug.GetPluginName())
|
mounter := plug.host.GetMounter(plug.GetPluginName())
|
||||||
fakeMountPoints := []mount.MountPoint{}
|
fakeMountPoints := []mount.MountPoint{}
|
||||||
@ -635,7 +635,7 @@ func TestUnsupportedPlugins(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
spec := getTestVolume(false, tmpDir, false, nil)
|
spec := getTestVolume(false, tmpDir, false, nil)
|
||||||
|
|
||||||
recyclePlug, err := plugMgr.FindRecyclablePluginBySpec(spec)
|
recyclePlug, err := plugMgr.FindRecyclablePluginBySpec(spec)
|
||||||
@ -678,7 +678,7 @@ func TestFilterPodMounts(t *testing.T) {
|
|||||||
t.Fatal("mounter is not localVolumeMounter")
|
t.Fatal("mounter is not localVolumeMounter")
|
||||||
}
|
}
|
||||||
|
|
||||||
host := volumetest.NewFakeVolumeHost(tmpDir, nil, nil)
|
host := volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil)
|
||||||
podsDir := host.GetPodsDir()
|
podsDir := host.GetPodsDir()
|
||||||
|
|
||||||
cases := map[string]struct {
|
cases := map[string]struct {
|
||||||
|
@ -40,7 +40,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/nfs")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/nfs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Can't find the plugin by name")
|
t.Errorf("Can't find the plugin by name")
|
||||||
@ -68,7 +68,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/nfs")
|
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/nfs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -87,7 +87,7 @@ func TestRecycler(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins([]volume.VolumePlugin{&nfsPlugin{nil, volume.VolumeConfig{}}}, nil, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins([]volume.VolumePlugin{&nfsPlugin{nil, volume.VolumeConfig{}}}, nil, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
spec := &volume.Spec{PersistentVolume: &v1.PersistentVolume{Spec: v1.PersistentVolumeSpec{PersistentVolumeSource: v1.PersistentVolumeSource{NFS: &v1.NFSVolumeSource{Path: "/foo"}}}}}
|
spec := &volume.Spec{PersistentVolume: &v1.PersistentVolume{Spec: v1.PersistentVolumeSpec{PersistentVolumeSource: v1.PersistentVolumeSource{NFS: &v1.NFSVolumeSource{Path: "/foo"}}}}}
|
||||||
_, pluginErr := plugMgr.FindRecyclablePluginBySpec(spec)
|
_, pluginErr := plugMgr.FindRecyclablePluginBySpec(spec)
|
||||||
@ -104,7 +104,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/nfs")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/nfs")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Can't find the plugin by name")
|
t.Errorf("Can't find the plugin by name")
|
||||||
@ -233,7 +233,7 @@ func TestPersistentClaimReadOnlyFlag(t *testing.T) {
|
|||||||
client := fake.NewSimpleClientset(pv, claim)
|
client := fake.NewSimpleClientset(pv, claim)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, client, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, client, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName(nfsPluginName)
|
plug, _ := plugMgr.FindPluginByName(nfsPluginName)
|
||||||
|
|
||||||
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
||||||
|
@ -43,7 +43,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/portworx-volume")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/portworx-volume")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -67,7 +67,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/portworx-volume")
|
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/portworx-volume")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -132,7 +132,7 @@ func TestPlugin(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/portworx-volume")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/portworx-volume")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -828,7 +828,7 @@ func newTestHost(t *testing.T, clientset clientset.Interface) (string, volume.Vo
|
|||||||
t.Fatalf("can't make a temp rootdir: %v", err)
|
t.Fatalf("can't make a temp rootdir: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return tempDir, volumetest.NewFakeVolumeHost(tempDir, clientset, emptydir.ProbeVolumePlugins())
|
return tempDir, volumetest.NewFakeVolumeHost(t, tempDir, clientset, emptydir.ProbeVolumePlugins())
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCanSupport(t *testing.T) {
|
func TestCanSupport(t *testing.T) {
|
||||||
|
@ -40,7 +40,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/quobyte")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/quobyte")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Can't find the plugin by name")
|
t.Errorf("Can't find the plugin by name")
|
||||||
@ -64,7 +64,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/quobyte")
|
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/quobyte")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -83,7 +83,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/quobyte")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/quobyte")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Can't find the plugin by name")
|
t.Errorf("Can't find the plugin by name")
|
||||||
@ -179,7 +179,7 @@ func TestPersistentClaimReadOnlyFlag(t *testing.T) {
|
|||||||
|
|
||||||
client := fake.NewSimpleClientset(pv, claim)
|
client := fake.NewSimpleClientset(pv, claim)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, client, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, client, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName(quobytePluginName)
|
plug, _ := plugMgr.FindPluginByName(quobytePluginName)
|
||||||
|
|
||||||
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
||||||
|
@ -102,7 +102,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/rbd")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/rbd")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -247,7 +247,7 @@ func checkMounterLog(t *testing.T, fakeMounter *mount.FakeMounter, expected int,
|
|||||||
}
|
}
|
||||||
|
|
||||||
func doTestPlugin(t *testing.T, c *testcase) {
|
func doTestPlugin(t *testing.T, c *testcase) {
|
||||||
fakeVolumeHost := volumetest.NewFakeVolumeHost(c.root, nil, nil)
|
fakeVolumeHost := volumetest.NewFakeVolumeHost(t, c.root, nil, nil)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, fakeVolumeHost)
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, fakeVolumeHost)
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/rbd")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/rbd")
|
||||||
@ -477,7 +477,7 @@ func TestPersistentClaimReadOnlyFlag(t *testing.T) {
|
|||||||
client := fake.NewSimpleClientset(pv, claim)
|
client := fake.NewSimpleClientset(pv, claim)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, client, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, client, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName(rbdPluginName)
|
plug, _ := plugMgr.FindPluginByName(rbdPluginName)
|
||||||
|
|
||||||
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
||||||
@ -533,7 +533,7 @@ func TestGetDeviceMountPath(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
fakeVolumeHost := volumetest.NewFakeVolumeHost(tmpDir, nil, nil)
|
fakeVolumeHost := volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, fakeVolumeHost)
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, fakeVolumeHost)
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/rbd")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/rbd")
|
||||||
@ -600,7 +600,7 @@ func TestConstructVolumeSpec(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
fakeVolumeHost := volumetest.NewFakeVolumeHost(tmpDir, nil, nil)
|
fakeVolumeHost := volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, fakeVolumeHost)
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, fakeVolumeHost)
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/rbd")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/rbd")
|
||||||
@ -660,7 +660,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/rbd")
|
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/rbd")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -677,7 +677,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
func TestRequiresRemount(t *testing.T) {
|
func TestRequiresRemount(t *testing.T) {
|
||||||
tmpDir, _ := utiltesting.MkTmpdir("rbd_test")
|
tmpDir, _ := utiltesting.MkTmpdir("rbd_test")
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName("kubernetes.io/rbd")
|
plug, _ := plugMgr.FindPluginByName("kubernetes.io/rbd")
|
||||||
has := plug.RequiresRemount()
|
has := plug.RequiresRemount()
|
||||||
if has {
|
if has {
|
||||||
|
@ -52,7 +52,7 @@ func newPluginMgr(t *testing.T, apiObject runtime.Object) (*volume.VolumePluginM
|
|||||||
}
|
}
|
||||||
|
|
||||||
fakeClient := fakeclient.NewSimpleClientset(apiObject)
|
fakeClient := fakeclient.NewSimpleClientset(apiObject)
|
||||||
host := volumetest.NewFakeVolumeHostWithNodeLabels(
|
host := volumetest.NewFakeVolumeHostWithNodeLabels(t,
|
||||||
tmpDir,
|
tmpDir,
|
||||||
fakeClient,
|
fakeClient,
|
||||||
ProbeVolumePlugins(),
|
ProbeVolumePlugins(),
|
||||||
|
@ -268,7 +268,7 @@ func newTestHost(t *testing.T, clientset clientset.Interface) (string, volume.Vo
|
|||||||
t.Fatalf("can't make a temp rootdir: %v", err)
|
t.Fatalf("can't make a temp rootdir: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return tempDir, volumetest.NewFakeVolumeHost(tempDir, clientset, emptydir.ProbeVolumePlugins())
|
return tempDir, volumetest.NewFakeVolumeHost(t, tempDir, clientset, emptydir.ProbeVolumePlugins())
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCanSupport(t *testing.T) {
|
func TestCanSupport(t *testing.T) {
|
||||||
|
@ -41,7 +41,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/storageos")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/storageos")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -65,7 +65,7 @@ func TestGetAccessModes(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/storageos")
|
plug, err := plugMgr.FindPersistentPluginByName("kubernetes.io/storageos")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -150,7 +150,7 @@ func TestPlugin(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/storageos")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/storageos")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -185,7 +185,7 @@ func TestPlugin(t *testing.T) {
|
|||||||
"apiAddr": []byte("tcp://localhost:5705"),
|
"apiAddr": []byte("tcp://localhost:5705"),
|
||||||
}})
|
}})
|
||||||
|
|
||||||
plug.(*storageosPlugin).host = volumetest.NewFakeVolumeHost(tmpDir, client, nil)
|
plug.(*storageosPlugin).host = volumetest.NewFakeVolumeHost(t, tmpDir, client, nil)
|
||||||
|
|
||||||
// Test Mounter
|
// Test Mounter
|
||||||
pod := &v1.Pod{ObjectMeta: metav1.ObjectMeta{UID: types.UID("poduid"), Namespace: "default"}}
|
pod := &v1.Pod{ObjectMeta: metav1.ObjectMeta{UID: types.UID("poduid"), Namespace: "default"}}
|
||||||
@ -365,7 +365,7 @@ func TestPersistentClaimReadOnlyFlag(t *testing.T) {
|
|||||||
|
|
||||||
client := fake.NewSimpleClientset(pv, claim)
|
client := fake.NewSimpleClientset(pv, claim)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, client, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, client, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName(storageosPluginName)
|
plug, _ := plugMgr.FindPluginByName(storageosPluginName)
|
||||||
|
|
||||||
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
// readOnly bool is supplied by persistent-claim volume source when its mounter creates other volumes
|
||||||
|
@ -119,7 +119,7 @@ func TestCreateVolume(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName("kubernetes.io/storageos")
|
plug, _ := plugMgr.FindPluginByName("kubernetes.io/storageos")
|
||||||
|
|
||||||
// Use real util with stubbed api
|
// Use real util with stubbed api
|
||||||
@ -209,7 +209,7 @@ func TestAttachVolume(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
plug, _ := plugMgr.FindPluginByName("kubernetes.io/storageos")
|
plug, _ := plugMgr.FindPluginByName("kubernetes.io/storageos")
|
||||||
|
|
||||||
// Use real util with stubbed api
|
// Use real util with stubbed api
|
||||||
|
@ -27,7 +27,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"k8s.io/utils/exec"
|
"k8s.io/utils/exec"
|
||||||
"k8s.io/utils/exec/testing"
|
testingexec "k8s.io/utils/exec/testing"
|
||||||
"k8s.io/utils/mount"
|
"k8s.io/utils/mount"
|
||||||
utilstrings "k8s.io/utils/strings"
|
utilstrings "k8s.io/utils/strings"
|
||||||
|
|
||||||
@ -89,49 +89,46 @@ type fakeVolumeHost struct {
|
|||||||
var _ VolumeHost = &fakeVolumeHost{}
|
var _ VolumeHost = &fakeVolumeHost{}
|
||||||
var _ AttachDetachVolumeHost = &fakeVolumeHost{}
|
var _ AttachDetachVolumeHost = &fakeVolumeHost{}
|
||||||
|
|
||||||
func NewFakeVolumeHost(rootDir string, kubeClient clientset.Interface, plugins []VolumePlugin) *fakeVolumeHost {
|
func NewFakeVolumeHost(t *testing.T, rootDir string, kubeClient clientset.Interface, plugins []VolumePlugin) *fakeVolumeHost {
|
||||||
return newFakeVolumeHost(rootDir, kubeClient, plugins, nil, nil, "", nil)
|
return newFakeVolumeHost(t, rootDir, kubeClient, plugins, nil, nil, "", nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewFakeVolumeHostWithCloudProvider(rootDir string, kubeClient clientset.Interface, plugins []VolumePlugin, cloud cloudprovider.Interface) *fakeVolumeHost {
|
func NewFakeVolumeHostWithCloudProvider(t *testing.T, rootDir string, kubeClient clientset.Interface, plugins []VolumePlugin, cloud cloudprovider.Interface) *fakeVolumeHost {
|
||||||
return newFakeVolumeHost(rootDir, kubeClient, plugins, cloud, nil, "", nil)
|
return newFakeVolumeHost(t, rootDir, kubeClient, plugins, cloud, nil, "", nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewFakeVolumeHostWithNodeLabels(rootDir string, kubeClient clientset.Interface, plugins []VolumePlugin, labels map[string]string) *fakeVolumeHost {
|
func NewFakeVolumeHostWithNodeLabels(t *testing.T, rootDir string, kubeClient clientset.Interface, plugins []VolumePlugin, labels map[string]string) *fakeVolumeHost {
|
||||||
volHost := newFakeVolumeHost(rootDir, kubeClient, plugins, nil, nil, "", nil)
|
volHost := newFakeVolumeHost(t, rootDir, kubeClient, plugins, nil, nil, "", nil)
|
||||||
volHost.nodeLabels = labels
|
volHost.nodeLabels = labels
|
||||||
return volHost
|
return volHost
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewFakeVolumeHostWithCSINodeName(rootDir string, kubeClient clientset.Interface, plugins []VolumePlugin, nodeName string, driverLister storagelisters.CSIDriverLister) *fakeVolumeHost {
|
func NewFakeVolumeHostWithCSINodeName(t *testing.T, rootDir string, kubeClient clientset.Interface, plugins []VolumePlugin, nodeName string, driverLister storagelisters.CSIDriverLister) *fakeVolumeHost {
|
||||||
volHost := newFakeVolumeHost(rootDir, kubeClient, plugins, nil, nil, nodeName, driverLister)
|
return newFakeVolumeHost(t, rootDir, kubeClient, plugins, nil, nil, nodeName, driverLister)
|
||||||
return volHost
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func newFakeVolumeHost(rootDir string, kubeClient clientset.Interface, plugins []VolumePlugin, cloud cloudprovider.Interface, pathToTypeMap map[string]hostutil.FileType, nodeName string, driverLister storagelisters.CSIDriverLister) *fakeVolumeHost {
|
func NewFakeVolumeHostWithMounterFSType(t *testing.T, rootDir string, kubeClient clientset.Interface, plugins []VolumePlugin, pathToTypeMap map[string]hostutil.FileType) *fakeVolumeHost {
|
||||||
|
return newFakeVolumeHost(t, rootDir, kubeClient, plugins, nil, pathToTypeMap, "", nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
func newFakeVolumeHost(t *testing.T, rootDir string, kubeClient clientset.Interface, plugins []VolumePlugin, cloud cloudprovider.Interface, pathToTypeMap map[string]hostutil.FileType, nodeName string, driverLister storagelisters.CSIDriverLister) *fakeVolumeHost {
|
||||||
host := &fakeVolumeHost{rootDir: rootDir, kubeClient: kubeClient, cloud: cloud, nodeName: nodeName, csiDriverLister: driverLister}
|
host := &fakeVolumeHost{rootDir: rootDir, kubeClient: kubeClient, cloud: cloud, nodeName: nodeName, csiDriverLister: driverLister}
|
||||||
host.mounter = mount.NewFakeMounter(nil)
|
host.mounter = mount.NewFakeMounter(nil)
|
||||||
host.hostUtil = hostutil.NewFakeHostUtil(pathToTypeMap)
|
host.hostUtil = hostutil.NewFakeHostUtil(pathToTypeMap)
|
||||||
host.exec = &testingexec.FakeExec{DisableScripts: true}
|
host.exec = &testingexec.FakeExec{DisableScripts: true}
|
||||||
host.pluginMgr = &VolumePluginMgr{}
|
host.pluginMgr = &VolumePluginMgr{}
|
||||||
if err := host.pluginMgr.InitPlugins(plugins, nil /* prober */, host); err != nil {
|
if err := host.pluginMgr.InitPlugins(plugins, nil /* prober */, host); err != nil {
|
||||||
// TODO(dyzz): Pipe testing context through and throw a fatal error instead
|
t.Fatalf("Failed to init plugins while creating fake volume host: %v", err)
|
||||||
panic(fmt.Sprintf("Failed to init plugins while creating fake volume host: %v", err))
|
|
||||||
}
|
}
|
||||||
host.subpather = &subpath.FakeSubpath{}
|
host.subpather = &subpath.FakeSubpath{}
|
||||||
host.informerFactory = informers.NewSharedInformerFactory(kubeClient, time.Minute)
|
host.informerFactory = informers.NewSharedInformerFactory(kubeClient, time.Minute)
|
||||||
// Wait until the InitPlugins setup is finished before returning from this setup func
|
// Wait until the InitPlugins setup is finished before returning from this setup func
|
||||||
if err := host.WaitForKubeletErrNil(); err != nil {
|
if err := host.WaitForKubeletErrNil(); err != nil {
|
||||||
panic(fmt.Sprintf("Failed to wait for kubelet err to be nil while creating fake volume host: %v", err))
|
t.Fatalf("Failed to wait for kubelet err to be nil while creating fake volume host: %v", err)
|
||||||
}
|
}
|
||||||
return host
|
return host
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewFakeVolumeHostWithMounterFSType(rootDir string, kubeClient clientset.Interface, plugins []VolumePlugin, pathToTypeMap map[string]hostutil.FileType) *fakeVolumeHost {
|
|
||||||
volHost := newFakeVolumeHost(rootDir, kubeClient, plugins, nil, pathToTypeMap, "", nil)
|
|
||||||
return volHost
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *fakeVolumeHost) GetPluginDir(podUID string) string {
|
func (f *fakeVolumeHost) GetPluginDir(podUID string) string {
|
||||||
return filepath.Join(f.rootDir, "plugins", podUID)
|
return filepath.Join(f.rootDir, "plugins", podUID)
|
||||||
}
|
}
|
||||||
@ -1532,6 +1529,7 @@ func GetTestVolumePluginMgr(
|
|||||||
t *testing.T) (*VolumePluginMgr, *FakeVolumePlugin) {
|
t *testing.T) (*VolumePluginMgr, *FakeVolumePlugin) {
|
||||||
plugins := ProbeVolumePlugins(VolumeConfig{})
|
plugins := ProbeVolumePlugins(VolumeConfig{})
|
||||||
v := NewFakeVolumeHost(
|
v := NewFakeVolumeHost(
|
||||||
|
t,
|
||||||
"", /* rootDir */
|
"", /* rootDir */
|
||||||
nil, /* kubeClient */
|
nil, /* kubeClient */
|
||||||
plugins, /* plugins */
|
plugins, /* plugins */
|
||||||
|
@ -32,7 +32,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestGetDeviceName_Volume(t *testing.T) {
|
func TestGetDeviceName_Volume(t *testing.T) {
|
||||||
plugin := newPlugin()
|
plugin := newPlugin(t)
|
||||||
volPath := "[local] volumes/test"
|
volPath := "[local] volumes/test"
|
||||||
spec := createVolSpec(volPath)
|
spec := createVolSpec(volPath)
|
||||||
|
|
||||||
@ -46,7 +46,7 @@ func TestGetDeviceName_Volume(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestGetDeviceName_PersistentVolume(t *testing.T) {
|
func TestGetDeviceName_PersistentVolume(t *testing.T) {
|
||||||
plugin := newPlugin()
|
plugin := newPlugin(t)
|
||||||
volPath := "[local] volumes/test"
|
volPath := "[local] volumes/test"
|
||||||
spec := createPVSpec(volPath)
|
spec := createPVSpec(volPath)
|
||||||
|
|
||||||
@ -166,8 +166,8 @@ func TestAttachDetach(t *testing.T) {
|
|||||||
|
|
||||||
// newPlugin creates a new vsphereVolumePlugin with fake cloud, NewAttacher
|
// newPlugin creates a new vsphereVolumePlugin with fake cloud, NewAttacher
|
||||||
// and NewDetacher won't work.
|
// and NewDetacher won't work.
|
||||||
func newPlugin() *vsphereVolumePlugin {
|
func newPlugin(t *testing.T) *vsphereVolumePlugin {
|
||||||
host := volumetest.NewFakeVolumeHost("/tmp", nil, nil)
|
host := volumetest.NewFakeVolumeHost(t, "/tmp", nil, nil)
|
||||||
plugins := ProbeVolumePlugins()
|
plugins := ProbeVolumePlugins()
|
||||||
plugin := plugins[0]
|
plugin := plugins[0]
|
||||||
plugin.Init(host)
|
plugin.Init(host)
|
||||||
|
@ -90,7 +90,7 @@ func TestGetPodAndPluginMapPaths(t *testing.T) {
|
|||||||
|
|
||||||
spec := getTestVolume(true) // block volume
|
spec := getTestVolume(true) // block volume
|
||||||
pluginMgr := volume.VolumePluginMgr{}
|
pluginMgr := volume.VolumePluginMgr{}
|
||||||
pluginMgr.InitPlugins(ProbeVolumePlugins(), nil, volumetest.NewFakeVolumeHost(tmpVDir, nil, nil))
|
pluginMgr.InitPlugins(ProbeVolumePlugins(), nil, volumetest.NewFakeVolumeHost(t, tmpVDir, nil, nil))
|
||||||
plugin, err := pluginMgr.FindMapperPluginByName(vsphereVolumePluginName)
|
plugin, err := pluginMgr.FindMapperPluginByName(vsphereVolumePluginName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
os.RemoveAll(tmpVDir)
|
os.RemoveAll(tmpVDir)
|
||||||
|
@ -43,7 +43,7 @@ func TestCanSupport(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/vsphere-volume")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/vsphere-volume")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -92,7 +92,7 @@ func TestPlugin(t *testing.T) {
|
|||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(tmpDir, nil, nil))
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
|
||||||
|
|
||||||
plug, err := plugMgr.FindPluginByName("kubernetes.io/vsphere-volume")
|
plug, err := plugMgr.FindPluginByName("kubernetes.io/vsphere-volume")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -214,7 +214,7 @@ func TestUnsupportedCloudProvider(t *testing.T) {
|
|||||||
|
|
||||||
plugMgr := volume.VolumePluginMgr{}
|
plugMgr := volume.VolumePluginMgr{}
|
||||||
plugMgr.InitPlugins(ProbeVolumePlugins(), nil, /* prober */
|
plugMgr.InitPlugins(ProbeVolumePlugins(), nil, /* prober */
|
||||||
volumetest.NewFakeVolumeHostWithCloudProvider(tmpDir, nil, nil, tc.cloudProvider))
|
volumetest.NewFakeVolumeHostWithCloudProvider(t, tmpDir, nil, nil, tc.cloudProvider))
|
||||||
|
|
||||||
plug, err := plugMgr.FindAttachablePluginByName("kubernetes.io/vsphere-volume")
|
plug, err := plugMgr.FindAttachablePluginByName("kubernetes.io/vsphere-volume")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -408,7 +408,7 @@ func createAdClients(ns *v1.Namespace, t *testing.T, server *httptest.Server, sy
|
|||||||
resyncPeriod := 12 * time.Hour
|
resyncPeriod := 12 * time.Hour
|
||||||
testClient := clientset.NewForConfigOrDie(&config)
|
testClient := clientset.NewForConfigOrDie(&config)
|
||||||
|
|
||||||
host := volumetest.NewFakeVolumeHost("/tmp/fake", nil, nil)
|
host := volumetest.NewFakeVolumeHost(t, "/tmp/fake", nil, nil)
|
||||||
plugin := &volumetest.FakeVolumePlugin{
|
plugin := &volumetest.FakeVolumePlugin{
|
||||||
PluginName: provisionerPluginName,
|
PluginName: provisionerPluginName,
|
||||||
Host: host,
|
Host: host,
|
||||||
|
@ -1109,7 +1109,7 @@ func createClients(ns *v1.Namespace, t *testing.T, s *httptest.Server, syncPerio
|
|||||||
Burst: 1000000,
|
Burst: 1000000,
|
||||||
})
|
})
|
||||||
|
|
||||||
host := volumetest.NewFakeVolumeHost("/tmp/fake", nil, nil)
|
host := volumetest.NewFakeVolumeHost(t, "/tmp/fake", nil, nil)
|
||||||
plugin := &volumetest.FakeVolumePlugin{
|
plugin := &volumetest.FakeVolumePlugin{
|
||||||
PluginName: provisionerPluginName,
|
PluginName: provisionerPluginName,
|
||||||
Host: host,
|
Host: host,
|
||||||
|
@ -839,7 +839,7 @@ func TestRescheduleProvisioning(t *testing.T) {
|
|||||||
context.closeFn()
|
context.closeFn()
|
||||||
}()
|
}()
|
||||||
|
|
||||||
ctrl, informerFactory, err := initPVController(context, 0)
|
ctrl, informerFactory, err := initPVController(t, context, 0)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Failed to create PV controller: %v", err)
|
t.Fatalf("Failed to create PV controller: %v", err)
|
||||||
}
|
}
|
||||||
@ -887,7 +887,7 @@ func setupCluster(t *testing.T, nsName string, numberOfNodes int, resyncPeriod t
|
|||||||
clientset := context.clientSet
|
clientset := context.clientSet
|
||||||
ns := context.ns.Name
|
ns := context.ns.Name
|
||||||
|
|
||||||
ctrl, informerFactory, err := initPVController(context, provisionDelaySeconds)
|
ctrl, informerFactory, err := initPVController(t, context, provisionDelaySeconds)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Failed to create PV controller: %v", err)
|
t.Fatalf("Failed to create PV controller: %v", err)
|
||||||
}
|
}
|
||||||
@ -924,13 +924,13 @@ func setupCluster(t *testing.T, nsName string, numberOfNodes int, resyncPeriod t
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func initPVController(context *testContext, provisionDelaySeconds int) (*persistentvolume.PersistentVolumeController, informers.SharedInformerFactory, error) {
|
func initPVController(t *testing.T, context *testContext, provisionDelaySeconds int) (*persistentvolume.PersistentVolumeController, informers.SharedInformerFactory, error) {
|
||||||
clientset := context.clientSet
|
clientset := context.clientSet
|
||||||
// Informers factory for controllers, we disable resync period for testing.
|
// Informers factory for controllers, we disable resync period for testing.
|
||||||
informerFactory := informers.NewSharedInformerFactory(clientset, 0)
|
informerFactory := informers.NewSharedInformerFactory(clientset, 0)
|
||||||
|
|
||||||
// Start PV controller for volume binding.
|
// Start PV controller for volume binding.
|
||||||
host := volumetest.NewFakeVolumeHost("/tmp/fake", nil, nil)
|
host := volumetest.NewFakeVolumeHost(t, "/tmp/fake", nil, nil)
|
||||||
plugin := &volumetest.FakeVolumePlugin{
|
plugin := &volumetest.FakeVolumePlugin{
|
||||||
PluginName: provisionerPluginName,
|
PluginName: provisionerPluginName,
|
||||||
Host: host,
|
Host: host,
|
||||||
|
Loading…
Reference in New Issue
Block a user