Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

egressgw: small test fixes #27574

Merged
merged 4 commits into from Aug 18, 2023
Merged

egressgw: small test fixes #27574

merged 4 commits into from Aug 18, 2023

Conversation

lmb
Copy link
Contributor

@lmb lmb commented Aug 17, 2023

bpf, egressgw: gate use of EGRESS_POLICY_MAP on define

EGRESS_POLICY_MAP is only defined if the egress gateway is enabled. Allow
including egressgw.h even if that is not the case, so that the helpers can
be reused.

Signed-off-by: Lorenz Bauer <lmb@isovalent.com>

bpf, egressgw: make it easier to correlate test cases with debug msg

When an egressgw BPF unit test fails it helpfully dumps any cilium debug 
messages with the test. The messages often contain port numbers which can be
used to infer which subtest generated them. Make it easier to go from port
number to subtest by accounting for endiannness in client_port().

Signed-off-by: Lorenz Bauer <lmb@isovalent.com>

bpf, egressgw: fix tc_egressgw_skip_excluded_cidr_redirect case

Use the correct test enum in tc_egressgw_skip_excluded_cidr_redirect to
avoid tests interfering with each other.

Signed-off-by: Lorenz Bauer <lmb@isovalent.com>

bpf, egressgw: always clear excluded cidr at end of snat test

Always clear the exclude CIDR rule, regardless of whether the test succeeds
or not. Otherwise subsequent tests will fail due to the presence of the
exclude rule.

Signed-off-by: Lorenz Bauer <lmb@isovalent.com>

EGRESS_POLICY_MAP is only defined if the egress gateway is enabled.
Allow including egressgw.h even if that is not the case, so that
the helpers can be reused.

Signed-off-by: Lorenz Bauer <lmb@isovalent.com>
When an egressgw BPF unit test fails it helpfully dumps any cilium debug
messages with the test. The messages often contain port numbers which
can be used to infer which subtest generated them. Make it easier to
go from port number to subtest by accounting for endiannness in
client_port().

Signed-off-by: Lorenz Bauer <lmb@isovalent.com>
Use the correct test enum in tc_egressgw_skip_excluded_cidr_redirect
to avoid tests interfering with each other.

Signed-off-by: Lorenz Bauer <lmb@isovalent.com>
Always clear the exclude CIDR rule, regardless of whether the test
succeeds or not. Otherwise subsequent tests will fail due to the
presence of the exclude rule.

Signed-off-by: Lorenz Bauer <lmb@isovalent.com>
@lmb lmb added release-note/misc This PR makes changes that have no direct user impact. feature/egress-gateway Impacts the egress IP gateway feature. labels Aug 17, 2023
@lmb
Copy link
Contributor Author

lmb commented Aug 17, 2023

/test

@lmb lmb marked this pull request as ready for review August 17, 2023 16:17
@lmb lmb requested a review from a team as a code owner August 17, 2023 16:17
@lmb lmb requested a review from aspsk August 17, 2023 16:17
Copy link
Contributor

@aspsk aspsk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Also thanks for the great commit descriptions.

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 18, 2023
@lmb lmb merged commit b0a668c into cilium:main Aug 18, 2023
61 checks passed
@lmb lmb deleted the egw-test-fixes branch August 18, 2023 07:39
@jibi jibi added the needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch label Aug 25, 2023
@jibi jibi mentioned this pull request Aug 25, 2023
3 tasks
@jibi jibi added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Aug 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. feature/egress-gateway Impacts the egress IP gateway feature. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants