From 0adcf144775cde6e2dc00b4eb39ea01bf7eea5f8 Mon Sep 17 00:00:00 2001 From: Kenichi Omichi Date: Thu, 22 Aug 2019 20:34:04 +0000 Subject: [PATCH] Use log functions of core framework on p* This makes sub packages of e2e test framework to use log functions of core framework instead for avoiding circular dependencies. --- test/e2e/framework/pods.go | 7 +++--- test/e2e/framework/pv_util.go | 43 +++++++++++++++++------------------ 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/test/e2e/framework/pods.go b/test/e2e/framework/pods.go index c64e2e615e9..a420d784e72 100644 --- a/test/e2e/framework/pods.go +++ b/test/e2e/framework/pods.go @@ -33,7 +33,6 @@ import ( podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/sysctl" - e2elog "k8s.io/kubernetes/test/e2e/framework/log" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" "github.com/onsi/ginkgo" @@ -151,11 +150,11 @@ func (c *PodClient) Update(name string, updateFn func(pod *v1.Pod)) { updateFn(pod) _, err = c.PodInterface.Update(pod) if err == nil { - e2elog.Logf("Successfully updated pod %q", name) + Logf("Successfully updated pod %q", name) return true, nil } if errors.IsConflict(err) { - e2elog.Logf("Conflicting update to pod %q, re-get and re-update: %v", name, err) + Logf("Conflicting update to pod %q, re-get and re-update: %v", name, err) return false, nil } return false, fmt.Errorf("failed to update pod %q: %v", name, err) @@ -173,7 +172,7 @@ func (c *PodClient) DeleteSync(name string, options *metav1.DeleteOptions, timeo func (c *PodClient) DeleteSyncInNamespace(name string, namespace string, options *metav1.DeleteOptions, timeout time.Duration) { err := c.Delete(name, options) if err != nil && !errors.IsNotFound(err) { - e2elog.Failf("Failed to delete pod %q: %v", name, err) + Failf("Failed to delete pod %q: %v", name, err) } gomega.Expect(e2epod.WaitForPodToDisappear(c.f.ClientSet, namespace, name, labels.Everything(), 2*time.Second, timeout)).To(gomega.Succeed(), "wait for pod %q to disappear", name) diff --git a/test/e2e/framework/pv_util.go b/test/e2e/framework/pv_util.go index 10ca196cddf..82025e49ff6 100644 --- a/test/e2e/framework/pv_util.go +++ b/test/e2e/framework/pv_util.go @@ -31,7 +31,6 @@ import ( clientset "k8s.io/client-go/kubernetes" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util" "k8s.io/kubernetes/pkg/volume/util" - e2elog "k8s.io/kubernetes/test/e2e/framework/log" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" imageutils "k8s.io/kubernetes/test/utils/image" ) @@ -140,7 +139,7 @@ func PVPVCCleanup(c clientset.Interface, ns string, pv *v1.PersistentVolume, pvc errs = append(errs, fmt.Errorf("failed to delete PVC %q: %v", pvc.Name, err)) } } else { - e2elog.Logf("pvc is nil") + Logf("pvc is nil") } if pv != nil { err := DeletePersistentVolume(c, pv.Name) @@ -148,7 +147,7 @@ func PVPVCCleanup(c clientset.Interface, ns string, pv *v1.PersistentVolume, pvc errs = append(errs, fmt.Errorf("failed to delete PV %q: %v", pv.Name, err)) } } else { - e2elog.Logf("pv is nil") + Logf("pv is nil") } return errs } @@ -182,7 +181,7 @@ func PVPVCMapCleanup(c clientset.Interface, ns string, pvols PVMap, claims PVCMa // DeletePersistentVolume deletes the PV. func DeletePersistentVolume(c clientset.Interface, pvName string) error { if c != nil && len(pvName) > 0 { - e2elog.Logf("Deleting PersistentVolume %q", pvName) + Logf("Deleting PersistentVolume %q", pvName) err := c.CoreV1().PersistentVolumes().Delete(pvName, nil) if err != nil && !apierrs.IsNotFound(err) { return fmt.Errorf("PV Delete API error: %v", err) @@ -194,7 +193,7 @@ func DeletePersistentVolume(c clientset.Interface, pvName string) error { // DeletePersistentVolumeClaim deletes the Claim. func DeletePersistentVolumeClaim(c clientset.Interface, pvcName string, ns string) error { if c != nil && len(pvcName) > 0 { - e2elog.Logf("Deleting PersistentVolumeClaim %q", pvcName) + Logf("Deleting PersistentVolumeClaim %q", pvcName) err := c.CoreV1().PersistentVolumeClaims(ns).Delete(pvcName, nil) if err != nil && !apierrs.IsNotFound(err) { return fmt.Errorf("PVC Delete API error: %v", err) @@ -208,14 +207,14 @@ func DeletePersistentVolumeClaim(c clientset.Interface, pvcName string, ns strin // phase value to expect for the pv bound to the to-be-deleted claim. func DeletePVCandValidatePV(c clientset.Interface, ns string, pvc *v1.PersistentVolumeClaim, pv *v1.PersistentVolume, expectPVPhase v1.PersistentVolumePhase) error { pvname := pvc.Spec.VolumeName - e2elog.Logf("Deleting PVC %v to trigger reclamation of PV %v", pvc.Name, pvname) + Logf("Deleting PVC %v to trigger reclamation of PV %v", pvc.Name, pvname) err := DeletePersistentVolumeClaim(c, pvc.Name, ns) if err != nil { return err } // Wait for the PV's phase to return to be `expectPVPhase` - e2elog.Logf("Waiting for reclaim process to complete.") + Logf("Waiting for reclaim process to complete.") err = WaitForPersistentVolumePhase(expectPVPhase, c, pv.Name, Poll, PVReclaimingTimeout) if err != nil { return fmt.Errorf("pv %q phase did not become %v: %v", pv.Name, expectPVPhase, err) @@ -240,7 +239,7 @@ func DeletePVCandValidatePV(c clientset.Interface, ns string, pvc *v1.Persistent } } - e2elog.Logf("PV %v now in %q phase", pv.Name, expectPVPhase) + Logf("PV %v now in %q phase", pv.Name, expectPVPhase) return nil } @@ -357,7 +356,7 @@ func CreatePVPVC(c clientset.Interface, pvConfig PersistentVolumeConfig, pvcConf if preBind { preBindMsg = " pre-bound" } - e2elog.Logf("Creating a PV followed by a%s PVC", preBindMsg) + Logf("Creating a PV followed by a%s PVC", preBindMsg) // make the pv and pvc definitions pv := MakePersistentVolume(pvConfig) @@ -430,7 +429,7 @@ func CreatePVsPVCs(numpvs, numpvcs int, c clientset.Interface, ns string, pvConf // WaitOnPVandPVC waits for the pv and pvc to bind to each other. func WaitOnPVandPVC(c clientset.Interface, ns string, pv *v1.PersistentVolume, pvc *v1.PersistentVolumeClaim) error { // Wait for newly created PVC to bind to the PV - e2elog.Logf("Waiting for PV %v to bind to PVC %v", pv.Name, pvc.Name) + Logf("Waiting for PV %v to bind to PVC %v", pv.Name, pvc.Name) err := WaitForPersistentVolumeClaimPhase(v1.ClaimBound, c, ns, pvc.Name, Poll, ClaimBindingTimeout) if err != nil { return fmt.Errorf("PVC %q did not become Bound: %v", pvc.Name, err) @@ -486,8 +485,8 @@ func WaitAndVerifyBinds(c clientset.Interface, ns string, pvols PVMap, claims PV for pvName := range pvols { err := WaitForPersistentVolumePhase(v1.VolumeBound, c, pvName, Poll, PVBindingTimeout) if err != nil && len(pvols) > len(claims) { - e2elog.Logf("WARN: pv %v is not bound after max wait", pvName) - e2elog.Logf(" This may be ok since there are more pvs than pvcs") + Logf("WARN: pv %v is not bound after max wait", pvName) + Logf(" This may be ok since there are more pvs than pvcs") continue } if err != nil { @@ -527,7 +526,7 @@ func testPodSuccessOrFail(c clientset.Interface, ns string, pod *v1.Pod) error { if err := e2epod.WaitForPodSuccessInNamespace(c, pod.Name, ns); err != nil { return fmt.Errorf("pod %q failed to reach Success: %v", pod.Name, err) } - e2elog.Logf("Pod %v succeeded ", pod.Name) + Logf("Pod %v succeeded ", pod.Name) return nil } @@ -543,7 +542,7 @@ func DeletePodWithWait(f *Framework, c clientset.Interface, pod *v1.Pod) error { // DeletePodWithWaitByName deletes the named and namespaced pod and waits for the pod to be terminated. Resilient to the pod // not existing. func DeletePodWithWaitByName(f *Framework, c clientset.Interface, podName, podNamespace string) error { - e2elog.Logf("Deleting pod %q in namespace %q", podName, podNamespace) + Logf("Deleting pod %q in namespace %q", podName, podNamespace) err := c.CoreV1().Pods(podNamespace).Delete(podName, nil) if err != nil { if apierrs.IsNotFound(err) { @@ -551,7 +550,7 @@ func DeletePodWithWaitByName(f *Framework, c clientset.Interface, podName, podNa } return fmt.Errorf("pod Delete API error: %v", err) } - e2elog.Logf("Wait up to %v for pod %q to be fully deleted", PodDeleteTimeout, podName) + Logf("Wait up to %v for pod %q to be fully deleted", PodDeleteTimeout, podName) err = f.WaitForPodNotFound(podName, PodDeleteTimeout) if err != nil { return fmt.Errorf("pod %q was not deleted: %v", podName, err) @@ -563,7 +562,7 @@ func DeletePodWithWaitByName(f *Framework, c clientset.Interface, podName, podNa // Note: need named return value so that the err assignment in the defer sets the returned error. // Has been shown to be necessary using Go 1.7. func CreateWaitAndDeletePod(f *Framework, c clientset.Interface, ns string, pvc *v1.PersistentVolumeClaim) (err error) { - e2elog.Logf("Creating nfs test pod") + Logf("Creating nfs test pod") pod := MakeWritePod(ns, pvc) runPod, err := c.CoreV1().Pods(ns).Create(pod) if err != nil { @@ -663,7 +662,7 @@ func MakePersistentVolumeClaim(cfg PersistentVolumeClaimConfig, ns string) *v1.P } if cfg.VolumeMode != nil && *cfg.VolumeMode == "" { - e2elog.Logf("Warning: Making PVC: VolumeMode specified as invalid empty string, treating as nil") + Logf("Warning: Making PVC: VolumeMode specified as invalid empty string, treating as nil") cfg.VolumeMode = nil } @@ -693,10 +692,10 @@ func createPDWithRetry(zone string) (string, error) { for start := time.Now(); time.Since(start) < pdRetryTimeout; time.Sleep(pdRetryPollTime) { newDiskName, err = createPD(zone) if err != nil { - e2elog.Logf("Couldn't create a new PD, sleeping 5 seconds: %v", err) + Logf("Couldn't create a new PD, sleeping 5 seconds: %v", err) continue } - e2elog.Logf("Successfully created a new PD: %q.", newDiskName) + Logf("Successfully created a new PD: %q.", newDiskName) return newDiskName, nil } return "", err @@ -718,10 +717,10 @@ func DeletePDWithRetry(diskName string) error { for start := time.Now(); time.Since(start) < pdRetryTimeout; time.Sleep(pdRetryPollTime) { err = deletePD(diskName) if err != nil { - e2elog.Logf("Couldn't delete PD %q, sleeping %v: %v", diskName, pdRetryPollTime, err) + Logf("Couldn't delete PD %q, sleeping %v: %v", diskName, pdRetryPollTime, err) continue } - e2elog.Logf("Successfully deleted PD %q.", diskName) + Logf("Successfully deleted PD %q.", diskName) return nil } return fmt.Errorf("unable to delete PD %q: %v", diskName, err) @@ -1096,7 +1095,7 @@ func GetDefaultStorageClassName(c clientset.Interface) (string, error) { if len(scName) == 0 { return "", fmt.Errorf("No default storage class found") } - e2elog.Logf("Default storage class: %q", scName) + Logf("Default storage class: %q", scName) return scName, nil }