test logging

Author: matmerr

test/e2e/framework/kubernetes/port-forward.go

@@ -64,14 +64,14 @@ func (p *PortForward) Run() error {
 	targetPodName := ""
 	if p.OptionalLabelAffinity != "" {
 		// get all pods with label
+		log.Printf("attempting to find pod with label \"%s\", on a node with a pod with label \"%s\"\n", p.LabelSelector, p.OptionalLabelAffinity)
 		targetPodName, err = p.findPodsWithAffinity(pctx, clientset)
 		if err != nil {
 			return fmt.Errorf("could not find pod with affinity: %w", err)
 		}
 	}
 
 	portForwardFn := func() error {
-		log.Printf("attempting port forward to a pod with label \"%s\", in namespace \"%s\"...\n", p.LabelSelector, p.Namespace)
 
 		// if we have a pod name (likely from affinity above), use it, otherwise use label selector
 		opts := k8s.PortForwardingOpts{
@@ -85,6 +85,8 @@ func (p *PortForward) Run() error {
 			opts.PodName = targetPodName
 		}
 
+		log.Printf("attempting port forward to pod name \"%s\" with label \"%s\", in namespace \"%s\"...\n", targetPodName, p.LabelSelector, p.Namespace)
+
 		p.pf, err = k8s.NewPortForwarder(config, &logger{}, opts)
 		if err != nil {
 			return fmt.Errorf("could not create port forwarder: %w", err)

test/e2e/framework/types/step_sleep.go

@@ -10,7 +10,7 @@ type Sleep struct {
 }
 
 func (c *Sleep) Run() error {
-	log.Printf("sleeping for %s...\n", c.Duration)
+	log.Printf("sleeping for %s...\n", c.Duration.String())
 	time.Sleep(c.Duration)
 	return nil
 }

test/e2e/scenarios/hubble/drop/scenario.go

@@ -1,8 +1,6 @@
 package drop
 
 import (
-	"time"
-
 	k8s "github.com/Azure/azure-container-networking/test/e2e/framework/kubernetes"
 	"github.com/Azure/azure-container-networking/test/e2e/framework/types"
 )
@@ -15,10 +13,6 @@ const (
 	// L4 protocols
 	TCP = "TCP"
 	UDP = "UDP"
-
-	sleepDelay        = 5
-	defaultTimeout    = 300 * time.Second
-	defaultRetryDelay = 5 * time.Second
 )
 
 func ValidateDropMetric() *types.Scenario {

test/e2e/scenarios/hubble/drop/validate-drop-metric.go

@@ -7,6 +7,7 @@ import (
 	"log"
 	"net/http"
 	"reflect"
+	"time"
 
 	"github.com/Azure/azure-container-networking/test/internal/retry"
 	promclient "github.com/prometheus/client_model/go"
@@ -21,7 +22,10 @@ const (
 	protcolKey     = "protocol"
 	reason         = "reason"
 
-	defaultRetryAttempts = 20
+	sleepDelay           = 5 * time.Second
+	defaultTimeout       = 300 * time.Second
+	defaultRetryDelay    = 5 * time.Second
+	defaultRetryAttempts = 60
 )
 
 type ValidateHubbleDropMetric struct {