-
Notifications
You must be signed in to change notification settings - Fork 367
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
Skip IPSec/WireGuard e2e test when the Multicast feature is enabled #6264
Merged
tnqn
merged 1 commit into
antrea-io:main
from
luolanzone:skip-encryption-e2e-when-multicast-enabled
May 10, 2024
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,25 +40,22 @@ func TestWireGuard(t *testing.T) { | |
t.Fatalf("Error when setting up test: %v", err) | ||
} | ||
defer teardownTest(t, data) | ||
luolanzone marked this conversation as resolved.
Show resolved
Hide resolved
|
||
skipIfMulticastEnabled(t, data) | ||
skipIfEncapModeIsNot(t, data, config.TrafficEncapModeEncap) | ||
for _, node := range clusterInfo.nodes { | ||
skipIfMissingKernelModule(t, data, node.name, []string{"wireguard"}) | ||
} | ||
var previousTrafficEncryptionMode string | ||
var previousMulticastEnabledState bool | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. After sync with wenying, we keep both IPSec and WireGuard test in the same way to simply disabled related encryption e2e tests when multicast is enabled. So no need to do this kind of check and restore anymore. |
||
ac := func(config *agentconfig.AgentConfig) { | ||
previousTrafficEncryptionMode = config.TrafficEncryptionMode | ||
config.TrafficEncryptionMode = "wireguard" | ||
previousMulticastEnabledState = config.Multicast.Enable | ||
config.Multicast.Enable = false | ||
} | ||
if err := data.mutateAntreaConfigMap(nil, ac, false, true); err != nil { | ||
t.Fatalf("Failed to enable WireGuard tunnel: %v", err) | ||
} | ||
defer func() { | ||
ac := func(config *agentconfig.AgentConfig) { | ||
config.TrafficEncryptionMode = previousTrafficEncryptionMode | ||
config.Multicast.Enable = previousMulticastEnabledState | ||
} | ||
if err := data.mutateAntreaConfigMap(nil, ac, false, true); err != nil { | ||
t.Errorf("Failed to disable WireGuard tunnel: %v", err) | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Regarding the IPSec test part, do you mean to do config mutation as wireguard test?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, my thought is to keep the two consistent, either both skip the case that "multicast.enabled=false", or use mutate to enforce they are run.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated.