e2e storage: add CreateFile to pod IO operations

This complements the other operations and will be used by some
future tests.
This commit is contained in:
Patrick Ohly 2022-08-17 10:38:25 +02:00
parent d9f21e55df
commit b6b25c80de

View File

@ -18,6 +18,7 @@ package proxy
import ( import (
"fmt" "fmt"
"io"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/storage/drivers/csi-test/mock/service" "k8s.io/kubernetes/test/e2e/storage/drivers/csi-test/mock/service"
@ -37,7 +38,7 @@ func (p PodDirIO) DirExists(path string) (bool, error) {
"sh", "sh",
"-c", "-c",
fmt.Sprintf("if ! [ -e '%s' ]; then echo notexist; elif [ -d '%s' ]; then echo dir; else echo nodir; fi", path, path), fmt.Sprintf("if ! [ -e '%s' ]; then echo notexist; elif [ -d '%s' ]; then echo dir; else echo nodir; fi", path, path),
}) }, nil)
if err != nil { if err != nil {
return false, fmt.Errorf("error executing dir test commands: stderr=%q, %v", stderr, err) return false, fmt.Errorf("error executing dir test commands: stderr=%q, %v", stderr, err)
} }
@ -54,27 +55,36 @@ func (p PodDirIO) DirExists(path string) (bool, error) {
} }
func (p PodDirIO) Mkdir(path string) error { func (p PodDirIO) Mkdir(path string) error {
_, stderr, err := p.execute([]string{"mkdir", path}) _, stderr, err := p.execute([]string{"mkdir", path}, nil)
if err != nil { if err != nil {
return fmt.Errorf("mkdir %q: stderr=%q, %v", path, stderr, err) return fmt.Errorf("mkdir %q: stderr=%q, %v", path, stderr, err)
} }
return nil return nil
} }
func (p PodDirIO) CreateFile(path string, content io.Reader) error {
_, stderr, err := p.execute([]string{"dd", "of=" + path}, content)
if err != nil {
return fmt.Errorf("dd of=%s: stderr=%q, %v", path, stderr, err)
}
return nil
}
func (p PodDirIO) RemoveAll(path string) error { func (p PodDirIO) RemoveAll(path string) error {
_, stderr, err := p.execute([]string{"rm", "-rf", path}) _, stderr, err := p.execute([]string{"rm", "-rf", path}, nil)
if err != nil { if err != nil {
return fmt.Errorf("rm -rf %q: stderr=%q, %v", path, stderr, err) return fmt.Errorf("rm -rf %q: stderr=%q, %v", path, stderr, err)
} }
return nil return nil
} }
func (p PodDirIO) execute(command []string) (string, string, error) { func (p PodDirIO) execute(command []string, stdin io.Reader) (string, string, error) {
return p.F.ExecWithOptions(framework.ExecOptions{ return p.F.ExecWithOptions(framework.ExecOptions{
Command: command, Command: command,
Namespace: p.Namespace, Namespace: p.Namespace,
PodName: p.PodName, PodName: p.PodName,
ContainerName: p.ContainerName, ContainerName: p.ContainerName,
Stdin: stdin,
CaptureStdout: true, CaptureStdout: true,
CaptureStderr: true, CaptureStderr: true,
Quiet: true, Quiet: true,