-
Notifications
You must be signed in to change notification settings - Fork 151
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make mount and staging dir creation flexible
This change adds an option to attach callback functions to CSI sanity for mount target directory creation. This could be used to customize the target and staging mount path creation. Also, adds `targetPath` and `stagingPath` fields to `SanityContext` to store the actual target and staging paths, derived from the sanity config. Adds an e2e test section to test the above setup.
- Loading branch information
Showing
4 changed files
with
141 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| package apitest2 | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "path" | ||
| "testing" | ||
|
|
||
| "github.com/kubernetes-csi/csi-test/pkg/sanity" | ||
| ) | ||
|
|
||
| // TestMyDriverWithCustomTargetPaths verifies that CreateTargetDir and | ||
| // CreateStagingDir are called a specific number of times. | ||
| func TestMyDriverWithCustomTargetPaths(t *testing.T) { | ||
| var createTargetDirCalls, createStagingDirCalls int | ||
|
|
||
| wantCreateTargetCalls := 3 | ||
| wantCreateStagingCalls := 3 | ||
|
|
||
| // tmpPath could be a CO specific directory under which all the target dirs | ||
| // are created. For k8s, it could be /var/lib/kubelet/pods under which the | ||
| // mount directories could be created. | ||
| tmpPath := path.Join(os.TempDir(), "csi") | ||
| config := &sanity.Config{ | ||
| TargetPath: "foo/target/mount", | ||
| StagingPath: "foo/staging/mount", | ||
| Address: "/tmp/e2e-csi-sanity.sock", | ||
| CreateTargetDir: func(targetPath string) (string, error) { | ||
| createTargetDirCalls++ | ||
| targetPath = path.Join(tmpPath, targetPath) | ||
| return targetPath, createTargetDir(targetPath) | ||
| }, | ||
| CreateStagingDir: func(targetPath string) (string, error) { | ||
| createStagingDirCalls++ | ||
| targetPath = path.Join(tmpPath, targetPath) | ||
| return targetPath, createTargetDir(targetPath) | ||
| }, | ||
| } | ||
|
|
||
| sanity.Test(t, config) | ||
|
|
||
| if createTargetDirCalls != wantCreateTargetCalls { | ||
| t.Errorf("unexpected number of CreateTargetDir calls:\n(WNT) %d\n(GOT) %d", wantCreateTargetCalls, createTargetDirCalls) | ||
| } | ||
|
|
||
| if createStagingDirCalls != wantCreateStagingCalls { | ||
| t.Errorf("unexpected number of CreateStagingDir calls:\n(WNT) %d\n(GOT) %d", wantCreateStagingCalls, createStagingDirCalls) | ||
| } | ||
| } | ||
|
|
||
| func createTargetDir(targetPath string) error { | ||
| fileInfo, err := os.Stat(targetPath) | ||
| if err != nil && os.IsNotExist(err) { | ||
| return os.MkdirAll(targetPath, 0755) | ||
| } else if err != nil { | ||
| return err | ||
| } | ||
| if !fileInfo.IsDir() { | ||
| return fmt.Errorf("Target location %s is not a directory", targetPath) | ||
| } | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters