-
Notifications
You must be signed in to change notification settings - Fork 389
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
[WIP Multicast] use real external node in multicast e2e #4034
Conversation
@@ -120,6 +125,9 @@ if [[ "${IP_MODE}" != "${DEFAULT_IP_MODE}" && "${IP_MODE}" != "ipv6" && "${IP_MO | |||
echoerr "--ip-mode must be ipv4, ipv6 or ds" | |||
exit 1 | |||
fi | |||
|
|||
EXTERNAL_HOSTS_CONFIG_PATH="ci/jenkins/external-hosts-config.yml" |
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.
TODO: rm this line and passing as argument when running in jenkins
else | ||
go test -v antrea.io/antrea/test/e2e --logs-export-dir `pwd`/antrea-test-logs --provider remote -timeout=100m --prometheus | ||
go test -run=TestMulticast -v antrea.io/antrea/test/e2e --logs-export-dir `pwd`/antrea-test-logs --external-hosts-config-path "$EXTERNAL_HOSTS_CONFIG_PATH" --provider remote -timeout=20m --prometheus |
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.
TODO: revert this line before merging
/test-multicast-e2e |
test/e2e/multicast_test.go
Outdated
// If multicast traffic is sent from an external host, the multicast route will be configured on the sender node because the sender node | ||
// and external host connect to the same gateway. | ||
// If sender-receivers are located in different nodes, the receivers should configure corresponding inbound multicast routes. | ||
if (mc.externalSender && receiverIdx == senderNodeIdx && receiverMulticastInterface == externalHostIface) || (!mc.externalSender && receiverIdx != senderNodeIdx) { |
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.
Do have such cases that both sender and receiver are external host? If not, this should never hit for the condition "(mc.externalSender && receiverIdx == senderNodeIdx"?
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.
I changed name from senderNodeIdx
to multiMcastIfaceNodeIdx
. External host and node with multiple multicast interfaces connects to the same gateway.Therefore it should be mcast route in multi-mcast interface node with iif externalIface.
test/e2e/multicast_test.go
Outdated
t.Run("testMulticastWithNoEncap", func(t *testing.T) { | ||
runMulticastTestCases(t, data, nodeMulticastInterfaces, true) | ||
}) | ||
t.Run("testMulticastWithEncap", func(t *testing.T) { |
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.
This is copied from #3947? Maybe remove it to keep this patch clean?
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
test/e2e/multicast_test.go
Outdated
|
||
func TestMulticast(t *testing.T) { | ||
skipIfNoExternalHosts(t) |
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.
I think we can have a single case dedicated for traffic with external host, and skip the single case if no external hosts is existing in the cluster, rather than skip all multicast test cases
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
test/e2e/framework.go
Outdated
@@ -154,6 +155,15 @@ type ClusterNode struct { | |||
os string | |||
} | |||
|
|||
type ExternalHost struct { | |||
Name string `name` |
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.
Use a complete json expression like json:"name"
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
77a909f
to
42160ad
Compare
/test-multicast-e2e |
Codecov Report
@@ Coverage Diff @@
## main #4034 +/- ##
==========================================
+ Coverage 64.40% 67.63% +3.23%
==========================================
Files 293 296 +3
Lines 43658 43763 +105
==========================================
+ Hits 28116 29599 +1483
+ Misses 13253 11855 -1398
- Partials 2289 2309 +20
|
42160ad
to
423af98
Compare
/test-multicast-e2e |
423af98
to
d37cd89
Compare
/test-multicast-e2e |
d37cd89
to
73c1ee4
Compare
/test-multicast-e2e |
73c1ee4
to
31a00ae
Compare
/test-multicast-e2e |
31a00ae
to
43e3a47
Compare
/test-multicast-e2e |
43e3a47
to
8797023
Compare
/test-multicast-e2e |
1 similar comment
/test-multicast-e2e |
8797023
to
838a6b0
Compare
/test-multicast-e2e |
1 similar comment
/test-multicast-e2e |
838a6b0
to
857565d
Compare
/test-multicast-e2e |
857565d
to
cc6d877
Compare
/test-multicast-e2e |
1 similar comment
/test-multicast-e2e |
/test-multicast-e2e |
This PR is stale because it has been open 90 days with no activity. Remove stale label or comment, or this will be closed in 90 days |
No description provided.