Use labels to enhance records filtering in FA e2e tests #5731
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yuntanghsu
changed the title
yuntanghsu
force-pushed
the
rm_ipfix_timesince
branch
2 times, most recently
from
abc51e5 to
968b45d
Compare
yuntanghsu
changed the title
yuntanghsu
force-pushed
the
rm_ipfix_timesince
branch
from
968b45d to
94ab3f2
Compare
yuntanghsu
force-pushed
the
rm_ipfix_timesince
branch
from
94ab3f2 to
6773619
Compare
antoninbas
reviewed
Nov 20, 2023
yuntanghsu
force-pushed
the
rm_ipfix_timesince
branch
8 times, most recently
from
9ce0eb8 to
6c8789f
Compare
antoninbas
reviewed
Nov 22, 2023
yuntanghsu
force-pushed
the
rm_ipfix_timesince
branch
2 times, most recently
from
de429cf to
70d2b32
Compare
antoninbas
reviewed
Nov 23, 2023
| @@ -1335,10 +1361,10 @@ func checkPodAndNodeDataClickHouse(data *TestData, t *testing.T, record *ClickHo | |||
| assert.Equal(record.DestinationPodName, dstPod, "Record with dstIP does not have Pod name: %s", dstPod) | |||
| assert.Equal(record.DestinationPodNamespace, data.testNamespace, "Record does not have correct destinationPodNamespace: %s", data.testNamespace) | |||
| assert.Equal(record.DestinationNodeName, dstNode, "Record does not have correct destinationNodeName: %s", dstNode) | |||
| assert.Equal(record.SourcePodLabels, fmt.Sprintf("{\"antrea-e2e\":\"%s\",\"app\":\"iperf\"}", srcPod), "Record does not have correct label for source Pod") | |||
| assert.Equal(record.DestinationPodLabels, fmt.Sprintf("{\"antrea-e2e\":\"%s\",\"app\":\"iperf\"}", dstPod), "Record does not have correct label for destination Pod") | |||
| assert.Contains(record.SourcePodLabels, fmt.Sprintf("\"antrea-e2e\":\"%s\",\"app\":\"iperf\"", srcPod), "Record does not have correct label for source Pod") | |||
There was a problem hiding this comment.
that relies on the labels being ordered alphabetically in the record. Is that guaranteed?
There was a problem hiding this comment.
Yes, when we add labels in Flow-Aggregator, we first use json.marshall for the label map, then convert it into a string.
And json.marshall will sort the map key lexicographically.
What I do here is just remove the curly bracket as we have extra label here.
yuntanghsu
force-pushed
the
rm_ipfix_timesince
branch
from
70d2b32 to
6325d6d
Compare
yuntanghsu
changed the title
yuntanghsu
changed the title
yuntanghsu
changed the title
yuntanghsu
force-pushed
the
rm_ipfix_timesince
branch
from
6325d6d to
707540f
Compare
antoninbas
changed the title
antoninbas
reviewed
Nov 27, 2023
There was a problem hiding this comment.
Does this fix #5730, I don't see a reference to the issue anywhere?
Also waiting for @heanlan and @dreamtalen to review
yuntanghsu
force-pushed
the
rm_ipfix_timesince
branch
from
707540f to
3dea401
Compare
In this commit, we: 1. Set a label to Perftest Pods before initiating traffic in each subtest to filter records in both the IPFIX collector Pod and the ClickHouse. 2. Remove the --since-time flag used during log retrieval from the IPFIX collector Pod in the e2e test. 3. Cease reliance on timestamps for record filtering due to potential time discrepancies between the testbed and Kubernetes nodes, which might hinder the retrieval of desired logs. Signed-off-by: Yun-Tang Hsu <hsuy@vmware.com>
yuntanghsu
force-pushed
the
rm_ipfix_timesince
branch
from
3dea401 to
8286d42
Compare
antoninbas
approved these changes
Nov 28, 2023
|
/test-e2e |
This was referenced Jan 11, 2024
yuntanghsu
added a commit
to yuntanghsu/antrea
that referenced
this pull request
Jan 22, 2024
In this commit, we: 1. Add a label to Perftest Pods before initiating traffic in each subtest to filter records in both the IPFIX collector Pod and the ClickHouse. 2. Remove the --since-time flag used during log retrieval from the IPFIX collector Pod in the e2e test. 3. Stop relying on timestamps for record filtering due to potential time discrepancies between the testbed and Kubernetes nodes, which might hinder the retrieval of desired records. Signed-off-by: Yun-Tang Hsu <hsuy@vmware.com>
antoninbas
pushed a commit
that referenced
this pull request
Jan 23, 2024
In this commit, we: 1. Add a label to Perftest Pods before initiating traffic in each subtest to filter records in both the IPFIX collector Pod and the ClickHouse. 2. Remove the --since-time flag used during log retrieval from the IPFIX collector Pod in the e2e test. 3. Stop relying on timestamps for record filtering due to potential time discrepancies between the testbed and Kubernetes nodes, which might hinder the retrieval of desired records. Signed-off-by: Yun-Tang Hsu <hsuy@vmware.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In this pull request, we:
resolve #5730