From e9cf6845441f01fd4f9bf0a6f14fbdd0cc707095 Mon Sep 17 00:00:00 2001 From: GraysonWu Date: Wed, 7 Apr 2021 09:52:14 -0700 Subject: [PATCH] Fix Traceflow e2e tests for IPv6 (#2034) 1. Change the TF name generation in e2e tests 2. Add `Packet` with `IPv6Header` to `tf.Spec` in TF LiveTraffic e2e tests --- test/e2e/traceflow_test.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/test/e2e/traceflow_test.go b/test/e2e/traceflow_test.go index 7f9ba452bd7..d210563d041 100644 --- a/test/e2e/traceflow_test.go +++ b/test/e2e/traceflow_test.go @@ -745,7 +745,7 @@ func TestTraceflowIntraNode(t *testing.T) { ipVersion: 6, tf: &v1alpha1.Traceflow{ ObjectMeta: metav1.ObjectMeta{ - Name: randName(fmt.Sprintf("%s-%s-to-%s-", testNamespace, node1Pods[0], dstPodIPv6Str)), + Name: randName(fmt.Sprintf("%s-%s-to-%s-", testNamespace, node1Pods[0], strings.ReplaceAll(dstPodIPv6Str, ":", "--"))), }, Spec: v1alpha1.TraceflowSpec{ Source: v1alpha1.Source{ @@ -755,6 +755,11 @@ func TestTraceflowIntraNode(t *testing.T) { Destination: v1alpha1.Destination{ IP: dstPodIPv6Str, }, + Packet: v1alpha1.Packet{ + IPv6Header: &v1alpha1.IPv6Header{ + NextHeader: &protocolICMPv6, + }, + }, LiveTraffic: true, }, }, @@ -789,7 +794,7 @@ func TestTraceflowIntraNode(t *testing.T) { ipVersion: 4, tf: &v1alpha1.Traceflow{ ObjectMeta: metav1.ObjectMeta{ - Name: randName(fmt.Sprintf("%s-%s-to-%s-", testNamespace, node1Pods[0], strings.ReplaceAll(gwIPv4Str, ":", "--"))), + Name: randName(fmt.Sprintf("%s-%s-to-%s-", testNamespace, node1Pods[0], gwIPv4Str)), }, Spec: v1alpha1.TraceflowSpec{ Source: v1alpha1.Source{ @@ -1582,6 +1587,11 @@ func TestTraceflowInterNode(t *testing.T) { Namespace: testNamespace, Pod: node2Pods[0], }, + Packet: v1alpha1.Packet{ + IPv6Header: &v1alpha1.IPv6Header{ + NextHeader: &protocolICMPv6, + }, + }, LiveTraffic: true, }, },