Skip to content

Commit

Permalink
Move EFS tests into e2e.go so that they can be imported from elsewhere
Browse files Browse the repository at this point in the history
  • Loading branch information
@wongma7
wongma7 committed Apr 21, 2020
1 parent 0df5cfb commit a5e806d
Show file tree
Hide file tree
Showing 2 changed files with 123 additions and 108 deletions.
119 changes: 119 additions & 0 deletions test/e2e/e2e.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
package e2e

import (
"fmt"

"github.com/onsi/ginkgo"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/storage/testpatterns"
"k8s.io/kubernetes/test/e2e/storage/testsuites"
)

var (
ClusterName string
Region string
fileSystemId string
)

type efsDriver struct {
driverInfo testsuites.DriverInfo
}

var _ testsuites.TestDriver = &efsDriver{}

// TODO implement Inline (unless it's redundant) and DynamicPV
// var _ testsuites.InlineVolumeTestDriver = &efsDriver{}
var _ testsuites.PreprovisionedPVTestDriver = &efsDriver{}

func InitEFSCSIDriver() testsuites.TestDriver {
return &efsDriver{
driverInfo: testsuites.DriverInfo{
Name: "efs.csi.aws.com",
SupportedFsType: sets.NewString(""),
SupportedMountOption: sets.NewString("tls", "ro"),
Capabilities: map[testsuites.Capability]bool{
testsuites.CapPersistence: true,
testsuites.CapExec: true,
testsuites.CapMultiPODs: true,
testsuites.CapRWX: true,
},
},
}
}

func (e *efsDriver) GetDriverInfo() *testsuites.DriverInfo {
return &e.driverInfo
}

func (e *efsDriver) SkipUnsupportedTest(testpatterns.TestPattern) {}

func (e *efsDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTestConfig, func()) {
ginkgo.By("Deploying EFS CSI driver")
cancelPodLogs := testsuites.StartPodLogs(f)

return &testsuites.PerTestConfig{
Driver: e,
Prefix: "efs",
Framework: f,
}, func() {
ginkgo.By("Cleaning up EFS CSI driver")
cancelPodLogs()
}
}

func (e *efsDriver) CreateVolume(config *testsuites.PerTestConfig, volType testpatterns.TestVolType) testsuites.TestVolume {
return nil
}

func (e *efsDriver) GetPersistentVolumeSource(readOnly bool, fsType string, volume testsuites.TestVolume) (*v1.PersistentVolumeSource, *v1.VolumeNodeAffinity) {
pvSource := v1.PersistentVolumeSource{
CSI: &v1.CSIPersistentVolumeSource{
Driver: e.driverInfo.Name,
VolumeHandle: fileSystemId,
},
}
return &pvSource, nil
}

// List of testSuites to be executed in below loop
var csiTestSuites = []func() testsuites.TestSuite{
testsuites.InitVolumesTestSuite,
testsuites.InitVolumeIOTestSuite,
testsuites.InitVolumeModeTestSuite,
testsuites.InitSubPathTestSuite,
testsuites.InitProvisioningTestSuite,
testsuites.InitMultiVolumeTestSuite,
}

var _ = ginkgo.BeforeSuite(func() {
ginkgo.By(fmt.Sprintf("Creating EFS filesystem in region %q for cluster %q", Region, ClusterName))
if Region == "" || ClusterName == "" {
ginkgo.Fail("failed to create EFS filesystem: both Region and ClusterName must be non-empty")
}
c := NewCloud(Region)
id, err := c.CreateFileSystem(ClusterName)
if err != nil {
ginkgo.Fail(fmt.Sprintf("failed to create EFS filesystem: %s", err))
}
fileSystemId = id
})

var _ = ginkgo.AfterSuite(func() {
ginkgo.By(fmt.Sprintf("Deleting EFS filesystem %s", fileSystemId))
if len(fileSystemId) != 0 {
c := NewCloud(Region)
err := c.DeleteFileSystem(fileSystemId)
if err != nil {
ginkgo.Fail(fmt.Sprintf("failed to delete EFS filesystem: %s", err))
}
}
})

var _ = ginkgo.Describe("[efs-csi] EFS CSI", func() {
driver := InitEFSCSIDriver()
ginkgo.Context(testsuites.GetDriverNameWithFeatureTags(driver), func() {
testsuites.DefineTestSuite(driver, csiTestSuites)
})
})
112 changes: 4 additions & 108 deletions test/e2e/e2e_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,13 @@ import (
"github.com/onsi/ginkgo/config"
"github.com/onsi/ginkgo/reporters"
"github.com/onsi/gomega"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kubernetes/test/e2e/framework"
frameworkconfig "k8s.io/kubernetes/test/e2e/framework/config"
"k8s.io/kubernetes/test/e2e/framework/testfiles"
"k8s.io/kubernetes/test/e2e/storage/testpatterns"
"k8s.io/kubernetes/test/e2e/storage/testsuites"
)

const kubeconfigEnvVar = "KUBECONFIG"

var (
clusterName = flag.String("cluster-name", "", "the cluster name")
region = flag.String("region", "us-west-2", "the region")
fileSystemId string
)

func init() {
testing.Init()
// k8s.io/kubernetes/test/e2e/framework requires env KUBECONFIG to be set
Expand All @@ -62,6 +52,10 @@ func init() {
frameworkconfig.CopyFlags(frameworkconfig.Flags, flag.CommandLine)
framework.RegisterCommonFlags(flag.CommandLine)
framework.RegisterClusterFlags(flag.CommandLine)

flag.StringVar(&ClusterName, "cluster-name", "", "the cluster name")
flag.StringVar(&Region, "region", "us-west-2", "the region")

flag.Parse()
}

Expand All @@ -81,101 +75,3 @@ func TestEFSCSI(t *testing.T) {

ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "EFS CSI Suite", r)
}

type efsDriver struct {
driverInfo testsuites.DriverInfo
}

var _ testsuites.TestDriver = &efsDriver{}

// TODO implement Inline (unless it's redundant) and DynamicPV
// var _ testsuites.InlineVolumeTestDriver = &efsDriver{}
var _ testsuites.PreprovisionedPVTestDriver = &efsDriver{}

func InitEFSCSIDriver() testsuites.TestDriver {
return &efsDriver{
driverInfo: testsuites.DriverInfo{
Name: "efs.csi.aws.com",
SupportedFsType: sets.NewString(""),
SupportedMountOption: sets.NewString("tls", "ro"),
Capabilities: map[testsuites.Capability]bool{
testsuites.CapPersistence: true,
testsuites.CapExec: true,
testsuites.CapMultiPODs: true,
testsuites.CapRWX: true,
},
},
}
}

func (e *efsDriver) GetDriverInfo() *testsuites.DriverInfo {
return &e.driverInfo
}

func (e *efsDriver) SkipUnsupportedTest(testpatterns.TestPattern) {}

func (e *efsDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTestConfig, func()) {
ginkgo.By("Deploying EFS CSI driver")
cancelPodLogs := testsuites.StartPodLogs(f)

return &testsuites.PerTestConfig{
Driver: e,
Prefix: "efs",
Framework: f,
}, func() {
ginkgo.By("Cleaning up EFS CSI driver")
cancelPodLogs()
}
}

func (e *efsDriver) CreateVolume(config *testsuites.PerTestConfig, volType testpatterns.TestVolType) testsuites.TestVolume {
return nil
}

func (e *efsDriver) GetPersistentVolumeSource(readOnly bool, fsType string, volume testsuites.TestVolume) (*v1.PersistentVolumeSource, *v1.VolumeNodeAffinity) {
pvSource := v1.PersistentVolumeSource{
CSI: &v1.CSIPersistentVolumeSource{
Driver: e.driverInfo.Name,
VolumeHandle: fileSystemId,
},
}
return &pvSource, nil
}

// List of testSuites to be executed in below loop
var csiTestSuites = []func() testsuites.TestSuite{
testsuites.InitVolumesTestSuite,
testsuites.InitVolumeIOTestSuite,
testsuites.InitVolumeModeTestSuite,
testsuites.InitSubPathTestSuite,
testsuites.InitProvisioningTestSuite,
testsuites.InitMultiVolumeTestSuite,
}

var _ = ginkgo.BeforeSuite(func() {
ginkgo.By(fmt.Sprintf("Creating EFS filesystem at %s on %s", *region, *clusterName))
c := NewCloud(*region)
id, err := c.CreateFileSystem(*clusterName)
if err != nil {
ginkgo.Fail(fmt.Sprintf("failed to create EFS filesystem: %s", err))
}
fileSystemId = id
})

var _ = ginkgo.AfterSuite(func() {
ginkgo.By(fmt.Sprintf("Deleting EFS filesystem %s", fileSystemId))
if len(fileSystemId) != 0 {
c := NewCloud(*region)
err := c.DeleteFileSystem(fileSystemId)
if err != nil {
ginkgo.Fail(fmt.Sprintf("failed to delete EFS filesystem: %s", err))
}
}
})

var _ = ginkgo.Describe("[efs-csi] EFS CSI", func() {
driver := InitEFSCSIDriver()
ginkgo.Context(testsuites.GetDriverNameWithFeatureTags(driver), func() {
testsuites.DefineTestSuite(driver, csiTestSuites)
})
})

0 comments on commit a5e806d

Please sign in to comment.