Skip to content

Commit a6f5ebf

Browse files
johnSchnakejohnSchnake
committed
Move storage tests to use the framework/log package
This is part of the transition to using framework/log instead of the Logf inside the framework package. This will help with import size/cycles when importing the framework or subpackages.
1 parent d5245b9 commit a6f5ebf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+311
-271
lines changed

‎test/e2e/storage/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ go_library(
6666
"//test/e2e/framework:go_default_library",
6767
"//test/e2e/framework/auth:go_default_library",
6868
"//test/e2e/framework/deployment:go_default_library",
69+
"//test/e2e/framework/log:go_default_library",
6970
"//test/e2e/framework/metrics:go_default_library",
7071
"//test/e2e/framework/providers/gce:go_default_library",
7172
"//test/e2e/framework/testfiles:go_default_library",

‎test/e2e/storage/csi_mock_volume.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import (
3737

3838
volumeutil "k8s.io/kubernetes/pkg/volume/util"
3939
"k8s.io/kubernetes/test/e2e/framework"
40+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
4041
"k8s.io/kubernetes/test/e2e/storage/drivers"
4142
"k8s.io/kubernetes/test/e2e/storage/testsuites"
4243
"k8s.io/kubernetes/test/e2e/storage/utils"
@@ -715,7 +716,7 @@ func checkPodInfo(cs clientset.Interface, namespace, driverPodName, driverContai
715716
if err != nil {
716717
return fmt.Errorf("could not load CSI driver logs: %s", err)
717718
}
718-
framework.Logf("CSI driver logs:\n%s", log)
719+
e2elog.Logf("CSI driver logs:\n%s", log)
719720
// Find NodePublish in the logs
720721
foundAttributes := sets.NewString()
721722
logLines := strings.Split(log, "\n")
@@ -734,7 +735,7 @@ func checkPodInfo(cs clientset.Interface, namespace, driverPodName, driverContai
734735
var call MockCSICall
735736
err := json.Unmarshal([]byte(line), &call)
736737
if err != nil {
737-
framework.Logf("Could not parse CSI driver log line %q: %s", line, err)
738+
e2elog.Logf("Could not parse CSI driver log line %q: %s", line, err)
738739
continue
739740
}
740741
if call.Method != "/csi.v1.Node/NodePublishVolume" {
@@ -745,7 +746,7 @@ func checkPodInfo(cs clientset.Interface, namespace, driverPodName, driverContai
745746
vv, found := call.Request.VolumeContext[k]
746747
if found && v == vv {
747748
foundAttributes.Insert(k)
748-
framework.Logf("Found volume attribute %s: %s", k, v)
749+
e2elog.Logf("Found volume attribute %s: %s", k, v)
749750
}
750751
}
751752
// Process just the first NodePublish, the rest of the log is useless.
@@ -767,7 +768,7 @@ func checkPodInfo(cs clientset.Interface, namespace, driverPodName, driverContai
767768
func waitForCSIDriver(cs clientset.Interface, driverName string) error {
768769
timeout := 4 * time.Minute
769770

770-
framework.Logf("waiting up to %v for CSIDriver %q", timeout, driverName)
771+
e2elog.Logf("waiting up to %v for CSIDriver %q", timeout, driverName)
771772
for start := time.Now(); time.Since(start) < timeout; time.Sleep(framework.Poll) {
772773
_, err := cs.StorageV1beta1().CSIDrivers().Get(driverName, metav1.GetOptions{})
773774
if !errors.IsNotFound(err) {
@@ -780,9 +781,9 @@ func waitForCSIDriver(cs clientset.Interface, driverName string) error {
780781
func destroyCSIDriver(cs clientset.Interface, driverName string) {
781782
driverGet, err := cs.StorageV1beta1().CSIDrivers().Get(driverName, metav1.GetOptions{})
782783
if err == nil {
783-
framework.Logf("deleting %s.%s: %s", driverGet.TypeMeta.APIVersion, driverGet.TypeMeta.Kind, driverGet.ObjectMeta.Name)
784+
e2elog.Logf("deleting %s.%s: %s", driverGet.TypeMeta.APIVersion, driverGet.TypeMeta.Kind, driverGet.ObjectMeta.Name)
784785
// Uncomment the following line to get full dump of CSIDriver object
785-
// framework.Logf("%s", framework.PrettyPrint(driverGet))
786+
// e2elog.Logf("%s", framework.PrettyPrint(driverGet))
786787
cs.StorageV1beta1().CSIDrivers().Delete(driverName, nil)
787788
}
788789
}

‎test/e2e/storage/drivers/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ go_library(
2323
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
2424
"//test/e2e/framework:go_default_library",
2525
"//test/e2e/framework/auth:go_default_library",
26+
"//test/e2e/framework/log:go_default_library",
2627
"//test/e2e/framework/volume:go_default_library",
2728
"//test/e2e/storage/testpatterns:go_default_library",
2829
"//test/e2e/storage/testsuites:go_default_library",

‎test/e2e/storage/drivers/csi_objects.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ import (
2727
"path"
2828
"path/filepath"
2929

30-
"k8s.io/api/core/v1"
30+
v1 "k8s.io/api/core/v1"
3131
apierrors "k8s.io/apimachinery/pkg/api/errors"
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
"k8s.io/apimachinery/pkg/util/uuid"
3434

3535
clientset "k8s.io/client-go/kubernetes"
3636
"k8s.io/kubernetes/test/e2e/framework"
37+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3738
)
3839

3940
var (
@@ -49,16 +50,16 @@ var (
4950

5051
func shredFile(filePath string) {
5152
if _, err := os.Stat(filePath); os.IsNotExist(err) {
52-
framework.Logf("File %v was not found, skipping shredding", filePath)
53+
e2elog.Logf("File %v was not found, skipping shredding", filePath)
5354
return
5455
}
55-
framework.Logf("Shredding file %v", filePath)
56+
e2elog.Logf("Shredding file %v", filePath)
5657
_, _, err := framework.RunCmd("shred", "--remove", filePath)
5758
if err != nil {
58-
framework.Logf("Failed to shred file %v: %v", filePath, err)
59+
e2elog.Logf("Failed to shred file %v: %v", filePath, err)
5960
}
6061
if _, err := os.Stat(filePath); os.IsNotExist(err) {
61-
framework.Logf("File %v successfully shredded", filePath)
62+
e2elog.Logf("File %v successfully shredded", filePath)
6263
return
6364
}
6465
// Shred failed Try to remove the file for good meausure
@@ -78,13 +79,13 @@ func createGCESecrets(client clientset.Interface, ns string) {
7879

7980
premadeSAFile, ok := os.LookupEnv(saEnv)
8081
if !ok {
81-
framework.Logf("Could not find env var %v, please either create cloud-sa"+
82+
e2elog.Logf("Could not find env var %v, please either create cloud-sa"+
8283
" secret manually or rerun test after setting %v to the filepath of"+
8384
" the GCP Service Account to give to the GCE Persistent Disk CSI Driver", saEnv, saEnv)
8485
return
8586
}
8687

87-
framework.Logf("Found CI service account key at %v", premadeSAFile)
88+
e2elog.Logf("Found CI service account key at %v", premadeSAFile)
8889
// Need to copy it saFile
8990
stdout, stderr, err := framework.RunCmd("cp", premadeSAFile, saFile)
9091
framework.ExpectNoError(err, "error copying service account key: %s\nstdout: %s\nstderr: %s", err, stdout, stderr)

‎test/e2e/storage/drivers/in_tree.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ import (
5555
"k8s.io/apiserver/pkg/authentication/serviceaccount"
5656
"k8s.io/kubernetes/test/e2e/framework"
5757
"k8s.io/kubernetes/test/e2e/framework/auth"
58+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
5859
"k8s.io/kubernetes/test/e2e/framework/volume"
5960
"k8s.io/kubernetes/test/e2e/storage/testpatterns"
6061
"k8s.io/kubernetes/test/e2e/storage/testsuites"
@@ -311,15 +312,15 @@ func (v *glusterVolume) DeleteVolume() {
311312

312313
name := v.prefix + "-server"
313314

314-
framework.Logf("Deleting Gluster endpoints %q...", name)
315+
e2elog.Logf("Deleting Gluster endpoints %q...", name)
315316
err := cs.CoreV1().Endpoints(ns.Name).Delete(name, nil)
316317
if err != nil {
317318
if !errors.IsNotFound(err) {
318319
framework.Failf("Gluster delete endpoints failed: %v", err)
319320
}
320-
framework.Logf("Gluster endpoints %q not found, assuming deleted", name)
321+
e2elog.Logf("Gluster endpoints %q not found, assuming deleted", name)
321322
}
322-
framework.Logf("Deleting Gluster server pod %q...", v.serverPod.Name)
323+
e2elog.Logf("Deleting Gluster server pod %q...", v.serverPod.Name)
323324
err = framework.DeletePodWithWait(f, cs, v.serverPod)
324325
if err != nil {
325326
framework.Failf("Gluster server pod delete failed: %v", err)
@@ -1057,7 +1058,7 @@ func (c *cinderDriver) CreateVolume(config *testsuites.PerTestConfig, volType te
10571058
By("creating a test Cinder volume")
10581059
output, err := exec.Command("cinder", "create", "--display-name="+volumeName, "1").CombinedOutput()
10591060
outputString := string(output[:])
1060-
framework.Logf("cinder output:\n%s", outputString)
1061+
e2elog.Logf("cinder output:\n%s", outputString)
10611062
framework.ExpectNoError(err)
10621063

10631064
// Parse 'id'' from stdout. Expected format:
@@ -1077,7 +1078,7 @@ func (c *cinderDriver) CreateVolume(config *testsuites.PerTestConfig, volType te
10771078
volumeID = fields[3]
10781079
break
10791080
}
1080-
framework.Logf("Volume ID: %s", volumeID)
1081+
e2elog.Logf("Volume ID: %s", volumeID)
10811082
Expect(volumeID).NotTo(Equal(""))
10821083
return &cinderVolume{
10831084
volumeName: volumeName,
@@ -1094,16 +1095,16 @@ func (v *cinderVolume) DeleteVolume() {
10941095
var err error
10951096
timeout := time.Second * 120
10961097

1097-
framework.Logf("Waiting up to %v for removal of cinder volume %s", timeout, name)
1098+
e2elog.Logf("Waiting up to %v for removal of cinder volume %s", timeout, name)
10981099
for start := time.Now(); time.Since(start) < timeout; time.Sleep(5 * time.Second) {
10991100
output, err = exec.Command("cinder", "delete", name).CombinedOutput()
11001101
if err == nil {
1101-
framework.Logf("Cinder volume %s deleted", name)
1102+
e2elog.Logf("Cinder volume %s deleted", name)
11021103
return
11031104
}
1104-
framework.Logf("Failed to delete volume %s: %v", name, err)
1105+
e2elog.Logf("Failed to delete volume %s: %v", name, err)
11051106
}
1106-
framework.Logf("Giving up deleting volume %s: %v\n%s", name, err, string(output[:]))
1107+
e2elog.Logf("Giving up deleting volume %s: %v\n%s", name, err, string(output[:]))
11071108
}
11081109

11091110
// GCE

‎test/e2e/storage/ephemeral_volume.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ import (
2121
"strings"
2222
"time"
2323

24-
"k8s.io/api/core/v1"
24+
v1 "k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/util/rand"
2727
clientset "k8s.io/client-go/kubernetes"
2828
"k8s.io/kubernetes/test/e2e/framework"
29+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
2930
"k8s.io/kubernetes/test/e2e/storage/utils"
3031
imageutils "k8s.io/kubernetes/test/utils/image"
3132

@@ -58,7 +59,7 @@ var _ = utils.SIGDescribe("Ephemeralstorage", func() {
5859

5960
// Allow it to sleep for 30 seconds
6061
time.Sleep(30 * time.Second)
61-
framework.Logf("Deleting pod %q/%q", pod.Namespace, pod.Name)
62+
e2elog.Logf("Deleting pod %q/%q", pod.Namespace, pod.Name)
6263
framework.ExpectNoError(framework.DeletePodWithWait(f, c, pod))
6364
})
6465
}

‎test/e2e/storage/flexvolume_mounted_volume_resize.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ import (
2222

2323
. "github.com/onsi/ginkgo"
2424
. "github.com/onsi/gomega"
25-
"k8s.io/api/core/v1"
25+
v1 "k8s.io/api/core/v1"
2626
storage "k8s.io/api/storage/v1"
2727
"k8s.io/apimachinery/pkg/api/resource"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
utilerrors "k8s.io/apimachinery/pkg/util/errors"
3030
clientset "k8s.io/client-go/kubernetes"
3131
"k8s.io/kubernetes/test/e2e/framework"
3232
e2edeploy "k8s.io/kubernetes/test/e2e/framework/deployment"
33+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3334
"k8s.io/kubernetes/test/e2e/storage/testsuites"
3435
"k8s.io/kubernetes/test/e2e/storage/utils"
3536
)
@@ -102,7 +103,7 @@ var _ = utils.SIGDescribe("Mounted flexvolume expand[Slow]", func() {
102103
})
103104

104105
AfterEach(func() {
105-
framework.Logf("AfterEach: Cleaning up resources for mounted volume resize")
106+
e2elog.Logf("AfterEach: Cleaning up resources for mounted volume resize")
106107

107108
if c != nil {
108109
if errs := framework.PVPVCCleanup(c, ns, nil, pvc); len(errs) > 0 {

‎test/e2e/storage/flexvolume_online_resize.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ import (
2222

2323
. "github.com/onsi/ginkgo"
2424
. "github.com/onsi/gomega"
25-
"k8s.io/api/core/v1"
25+
v1 "k8s.io/api/core/v1"
2626
storage "k8s.io/api/storage/v1"
2727
"k8s.io/apimachinery/pkg/api/resource"
2828
utilerrors "k8s.io/apimachinery/pkg/util/errors"
2929
clientset "k8s.io/client-go/kubernetes"
3030
"k8s.io/kubernetes/test/e2e/framework"
31+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3132
"k8s.io/kubernetes/test/e2e/storage/testsuites"
3233
"k8s.io/kubernetes/test/e2e/storage/utils"
3334
)
@@ -101,7 +102,7 @@ var _ = utils.SIGDescribe("Mounted flexvolume volume expand [Slow] [Feature:Expa
101102
})
102103

103104
AfterEach(func() {
104-
framework.Logf("AfterEach: Cleaning up resources for mounted volume resize")
105+
e2elog.Logf("AfterEach: Cleaning up resources for mounted volume resize")
105106

106107
if c != nil {
107108
if errs := framework.PVPVCCleanup(c, ns, nil, pvc); len(errs) > 0 {

‎test/e2e/storage/generic_persistent_volume-disruptive.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ import (
2020
. "github.com/onsi/ginkgo"
2121
. "github.com/onsi/gomega"
2222

23-
"k8s.io/api/core/v1"
23+
v1 "k8s.io/api/core/v1"
2424
clientset "k8s.io/client-go/kubernetes"
2525
"k8s.io/kubernetes/test/e2e/framework"
26+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
2627
"k8s.io/kubernetes/test/e2e/storage/testsuites"
2728
"k8s.io/kubernetes/test/e2e/storage/utils"
2829
)
@@ -65,7 +66,7 @@ var _ = utils.SIGDescribe("GenericPersistentVolume[Disruptive]", func() {
6566
pv *v1.PersistentVolume
6667
)
6768
BeforeEach(func() {
68-
framework.Logf("Initializing pod and pvcs for test")
69+
e2elog.Logf("Initializing pod and pvcs for test")
6970
clientPod, pvc, pv = createPodPVCFromSC(f, c, ns)
7071
})
7172
for _, test := range disruptiveTestTable {
@@ -77,7 +78,7 @@ var _ = utils.SIGDescribe("GenericPersistentVolume[Disruptive]", func() {
7778
}(test)
7879
}
7980
AfterEach(func() {
80-
framework.Logf("Tearing down test spec")
81+
e2elog.Logf("Tearing down test spec")
8182
tearDownTestCase(c, f, ns, clientPod, pvc, pv, false)
8283
pvc, clientPod = nil, nil
8384
})

‎test/e2e/storage/mounted_volume_resize.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
. "github.com/onsi/ginkgo"
2323
. "github.com/onsi/gomega"
2424
apps "k8s.io/api/apps/v1"
25-
"k8s.io/api/core/v1"
25+
v1 "k8s.io/api/core/v1"
2626
storage "k8s.io/api/storage/v1"
2727
"k8s.io/apimachinery/pkg/api/resource"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -32,6 +32,7 @@ import (
3232
"k8s.io/kubernetes/pkg/client/conditions"
3333
"k8s.io/kubernetes/test/e2e/framework"
3434
e2edeploy "k8s.io/kubernetes/test/e2e/framework/deployment"
35+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3536
"k8s.io/kubernetes/test/e2e/storage/testsuites"
3637
"k8s.io/kubernetes/test/e2e/storage/utils"
3738
)
@@ -97,7 +98,7 @@ var _ = utils.SIGDescribe("Mounted volume expand", func() {
9798
})
9899

99100
AfterEach(func() {
100-
framework.Logf("AfterEach: Cleaning up resources for mounted volume resize")
101+
e2elog.Logf("AfterEach: Cleaning up resources for mounted volume resize")
101102

102103
if c != nil {
103104
if errs := framework.PVPVCCleanup(c, ns, nil, pvc); len(errs) > 0 {

0 commit comments

Comments
 (0)