Merge pull request kubernetes#76414 from SataQiu/refactor-e2e-volume-20190411

[e2e] test/e2e/framework/volume_util.go -> test/e2e/framework/volume/fixtures.go

Author: k8s-ci-robot

test/e2e/common/BUILD

@@ -78,6 +78,7 @@ go_library(
         "//staging/src/k8s.io/client-go/tools/watch:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/framework/replicaset:go_default_library",
+        "//test/e2e/framework/volume:go_default_library",
         "//test/utils:go_default_library",
         "//test/utils/image:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",

test/e2e/common/volumes.go

@@ -46,6 +46,7 @@ import (
 	"k8s.io/api/core/v1"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/test/e2e/framework"
+	"k8s.io/kubernetes/test/e2e/framework/volume"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -73,10 +74,10 @@ var _ = Describe("[sig-storage] GCP Volumes", func() {
 	////////////////////////////////////////////////////////////////////////
 	Describe("NFSv4", func() {
 		It("should be mountable for NFSv4", func() {
-			config, _, serverIP := framework.NewNFSServer(c, namespace.Name, []string{})
-			defer framework.VolumeTestCleanup(f, config)
+			config, _, serverIP := volume.NewNFSServer(c, namespace.Name, []string{})
+			defer volume.TestCleanup(f, config)
 
-			tests := []framework.VolumeTest{
+			tests := []volume.Test{
 				{
 					Volume: v1.VolumeSource{
 						NFS: &v1.NFSVolumeSource{
@@ -91,16 +92,16 @@ var _ = Describe("[sig-storage] GCP Volumes", func() {
 			}
 
 			// Must match content of test/images/volumes-tester/nfs/index.html
-			framework.TestVolumeClient(c, config, nil, "" /* fsType */, tests)
+			volume.TestVolumeClient(c, config, nil, "" /* fsType */, tests)
 		})
 	})
 
 	Describe("NFSv3", func() {
 		It("should be mountable for NFSv3", func() {
-			config, _, serverIP := framework.NewNFSServer(c, namespace.Name, []string{})
-			defer framework.VolumeTestCleanup(f, config)
+			config, _, serverIP := volume.NewNFSServer(c, namespace.Name, []string{})
+			defer volume.TestCleanup(f, config)
 
-			tests := []framework.VolumeTest{
+			tests := []volume.Test{
 				{
 					Volume: v1.VolumeSource{
 						NFS: &v1.NFSVolumeSource{
@@ -114,7 +115,7 @@ var _ = Describe("[sig-storage] GCP Volumes", func() {
 				},
 			}
 			// Must match content of test/images/volume-tester/nfs/index.html
-			framework.TestVolumeClient(c, config, nil, "" /* fsType */, tests)
+			volume.TestVolumeClient(c, config, nil, "" /* fsType */, tests)
 		})
 	})
 
@@ -124,15 +125,15 @@ var _ = Describe("[sig-storage] GCP Volumes", func() {
 	Describe("GlusterFS", func() {
 		It("should be mountable", func() {
 			// create gluster server and endpoints
-			config, _, _ := framework.NewGlusterfsServer(c, namespace.Name)
+			config, _, _ := volume.NewGlusterfsServer(c, namespace.Name)
 			name := config.Prefix + "-server"
 			defer func() {
-				framework.VolumeTestCleanup(f, config)
+				volume.TestCleanup(f, config)
 				err := c.CoreV1().Endpoints(namespace.Name).Delete(name, nil)
 				Expect(err).NotTo(HaveOccurred(), "defer: Gluster delete endpoints failed")
 			}()
 
-			tests := []framework.VolumeTest{
+			tests := []volume.Test{
 				{
 					Volume: v1.VolumeSource{
 						Glusterfs: &v1.GlusterfsVolumeSource{
@@ -147,7 +148,7 @@ var _ = Describe("[sig-storage] GCP Volumes", func() {
 					ExpectedContent: "Hello from GlusterFS!",
 				},
 			}
-			framework.TestVolumeClient(c, config, nil, "" /* fsType */, tests)
+			volume.TestVolumeClient(c, config, nil, "" /* fsType */, tests)
 		})
 	})
 })

test/e2e/framework/BUILD

@@ -34,7 +34,6 @@ go_library(
         "test_context.go",
         "upgrade_util.go",
         "util.go",
-        "volume_util.go",
     ],
     importpath = "k8s.io/kubernetes/test/e2e/framework",
     deps = [
@@ -167,6 +166,7 @@ filegroup(
         "//test/e2e/framework/testfiles:all-srcs",
         "//test/e2e/framework/timer:all-srcs",
         "//test/e2e/framework/viperconfig:all-srcs",
+        "//test/e2e/framework/volume:all-srcs",
     ],
     tags = ["automanaged"],
 )

test/e2e/framework/volume/BUILD

@@ -0,0 +1,33 @@
+package(default_visibility = ["//visibility:public"])
+
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["fixtures.go"],
+    importpath = "k8s.io/kubernetes/test/e2e/framework/volume",
+    deps = [
+        "//staging/src/k8s.io/api/core/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/rand:go_default_library",
+        "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
+        "//test/e2e/framework:go_default_library",
+        "//test/utils/image:go_default_library",
+        "//vendor/github.com/onsi/ginkgo:go_default_library",
+        "//vendor/github.com/onsi/gomega:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+)

test/e2e/framework/volume/OWNERS

@@ -0,0 +1,20 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+approvers:
+- saad-ali
+- rootfs
+- gnufied
+- jingxu97
+- jsafrane
+- msau42
+reviewers:
+- saad-ali
+- rootfs
+- gnufied
+- jingxu97
+- jsafrane
+- msau42
+- jeffvance
+- copejon
+- verult
+- davidz627