github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

e2e test layout changes for vsphere (#398)

Browse Source
This commit is contained in:
Rohit Jog
2017-11-29 14:08:28 -08:00
committed by rohitjogvmw
parent 17117051c4
commit 015e20cb15
37 changed files with 462 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/storage/volumes.go
View File

@@ -55,6 +55,8 @@ import (
clientset "k8s.io/client-go/kubernetes"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/storage/utils"
vspheretest "k8s.io/kubernetes/test/e2e/storage/vsphere"
)
func DeleteCinderVolume(name string) error {
@@ -79,7 +81,7 @@ func DeleteCinderVolume(name string) error {
}
// These tests need privileged containers, which are disabled by default.
var _ = SIGDescribe("Volumes", func() {
var _ = utils.SIGDescribe("Volumes", func() {
f := framework.NewDefaultFramework("volume")
// note that namespace deletion is handled by delete-namespace flag
@@ -510,10 +512,10 @@ var _ = SIGDescribe("Volumes", func() {
if err != nil {
return
}
vsp, err := getVSphere(c)
vsp, err := vspheretest.GetVSphere(c)
Expect(err).NotTo(HaveOccurred())
volumePath, err = createVSphereVolume(vsp, nil)
volumePath, err = vspheretest.CreateVSphereVolume(vsp, nil)
Expect(err).NotTo(HaveOccurred())
defer func() {