refactor

microsoft · Dec 12, 2024 · 2bf3819 · 2bf3819
1 parent d5bd99e
commit 2bf3819
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/test/e2e/common/validate-metric.go b/test/e2e/common/validate-metric.go
@@ -8,6 +8,10 @@ import (
 	prom "github.com/microsoft/retina/test/e2e/framework/prometheus"
 )
 
+var (
+	ErrMetricFound = errors.New("unexpected metric found")
+)
+
 type ValidateMetric struct {
 	ForwardedPort string
 	MetricName    string
@@ -31,7 +35,7 @@ func (v *ValidateMetric) Run() error {
 
 		// if we expect the metric not to be found, return an error if it is found
 		if !v.ExpectMetric {
-			return fmt.Errorf("did not expect to find metric %s matching %+v", v.MetricName, validMetric)
+			return fmt.Errorf("did not expect to find metric %s matching %+v: %w", v.MetricName, validMetric, ErrMetricFound)
 		}
 
 		log.Printf("found metric %s matching %+v\n", v.MetricName, validMetric)

diff --git a/test/e2e/framework/constants/networking.go b/test/e2e/framework/constants/networking.go
@@ -6,7 +6,7 @@ const (
 	IPV4            = "IPv4"
 	IPTableRuleDrop = "IPTABLE_RULE_DROP"
 	SYN             = "SYN"
-	SYN_ACK         = "SYN-ACK"
+	SYNACK          = "SYN-ACK"
 	ACK             = "ACK"
 	FIN             = "FIN"
 	RST             = "RST"

diff --git a/test/e2e/jobs/jobs.go b/test/e2e/jobs/jobs.go
@@ -262,7 +262,7 @@ func InstallAndTestHubbleMetrics(kubeConfigFilePath, chartPath string, testPodNa
 	hubbleScrenarios := []*types.Scenario{
 		hubble_dns.ValidateDNSMetric(),
 		hubble_flow.ValidateFlowMetric(),
-		//hubble_drop.ValidateDropMetric(),
+		// hubble_drop.ValidateDropMetric(), TODO Needs to investigate why drop metrics are not present.
 		hubble_tcp.ValidateTCPMetric(),
 		hubble_service.ValidateHubbleRelayService(),
 		hubble_service.ValidateHubbleUIService(kubeConfigFilePath),

diff --git a/test/e2e/scenarios/hubble/flow/labels.go b/test/e2e/scenarios/hubble/flow/labels.go
@@ -42,6 +42,7 @@ var (
 
 	validHubbleFlowMetricsLabels = []map[string]string{
 		validHubbleFlowLabelsToStack,
+		// TODO: Needs to further investigate why these labels are not being generated
 		// validHubbleFlowLabelsToNetwork,
 		// validHubbleFlowLabelsFromNetwork,
 		validHubbleFlowLabelsToEndpoint,

diff --git a/test/e2e/scenarios/hubble/tcp/labels.go b/test/e2e/scenarios/hubble/tcp/labels.go
@@ -17,7 +17,7 @@ var (
 		constants.HubbleSourceLabel:      "",
 		constants.HubbleDestinationLabel: common.TestPodNamespace + "/" + podName,
 		constants.HubbleFamilyLabel:      constants.IPV4,
-		constants.HubbleFlagLabel:        constants.SYN_ACK,
+		constants.HubbleFlagLabel:        constants.SYNACK,
 	}
 	validHubbleTCPFINFlag = map[string]string{
 		constants.HubbleSourceLabel:      "",
@@ -28,7 +28,7 @@ var (
 
 	validHubbleTCPMetricsLabels = []map[string]string{
 		validHubbleTCPSYNFlag,
-		//validHubbleTCPSYNACKFlag,
+		// validHubbleTCPSYNACKFlag, TODO: Needs to further investigate why these labels are not being generated
 		validHubbleTCPFINFlag,
 	}
 )