[multicast] Drop (m)vlan from multicast groups#9451
Open
zeeshanlakhani wants to merge 2 commits intomainfrom
Open
[multicast] Drop (m)vlan from multicast groups#9451zeeshanlakhani wants to merge 2 commits intomainfrom
zeeshanlakhani wants to merge 2 commits intomainfrom
Conversation
4 tasks
zeeshanlakhani
requested review from
FelixMcFelix,
internet-diglett and
rcgoodfellow
zeeshanlakhani
force-pushed
the
zl/drop-mvlan-from-group
branch
from
05ed654 to
68a0df3
Compare
rcgoodfellow
approved these changes
Dec 10, 2025
zeeshanlakhani
force-pushed
the
zl/drop-mvlan-from-group
branch
2 times, most recently
from
f86fc3f to
5ca441d
Compare
Collaborator
Author
|
This PR should be good now after rummaging through conflicts on sources post-merge of #9450. |
zeeshanlakhani
added a commit
that referenced
this pull request
Dec 23, 2025
Previously, each silo could only have one default IP pool. This change allows one default pool per (pool_type, ip_version) combination, enabling silos to have separate defaults for: - Unicast IPv4 - Unicast IPv6 - Multicast IPv4 - Multicast IPv6 This work previously branched off #9451, but now off `main`, involving changes that have to do with the mcast lifecycle changes. Includes: - Each default can now be set or unset and demoted independently. Unsetting the unicast IPv4 default does not affect the multicast IPv4 default, for example. - Add `pool_type` and `ip_version` columns to `ip_pool_resource` (denormalized from parent `ip_pool` for unique index) - Replace unique index with partial index on (resource_id, pool_type, ip_version) WHERE is_default = true - Rename `IpPoolResourceLink` to `IncompleteIpPoolResource` to reflect that pool_type/ip_version are actually populated by the linking query - Add `ip_version` field to API params for default pool disambiguation - API versioning for backwards compatibility with older clients
zeeshanlakhani
added a commit
that referenced
this pull request
Dec 23, 2025
Previously, each silo could only have one default IP pool. This change allows one default pool per (pool_type, ip_version) combination, enabling silos to have separate defaults for: - Unicast IPv4 - Unicast IPv6 - Multicast IPv4 - Multicast IPv6 This work previously branched off #9451, but is now off `main`, involving changes that have to do with the mcast lifecycle changes. Includes: - Each default can now be set or unset and demoted independently. Unsetting the unicast IPv4 default does not affect the multicast IPv4 default, for example. - Add `pool_type` and `ip_version` columns to `ip_pool_resource` (denormalized from parent `ip_pool` for unique index) - Replace unique index with partial index on (resource_id, pool_type, ip_version) WHERE is_default = true - Rename `IpPoolResourceLink` to `IncompleteIpPoolResource` to reflect that pool_type/ip_version are actually populated by the linking query - Add `ip_version` field to API params for default pool disambiguation - API versioning for backwards compatibility with older clients
zeeshanlakhani
added a commit
that referenced
this pull request
Dec 23, 2025
Previously, each silo could only have one default IP pool. This change allows one default pool per (pool_type, ip_version) combination, enabling silos to have separate defaults for: - Unicast IPv4 - Unicast IPv6 - Multicast IPv4 - Multicast IPv6 This work previously branched off #9451, but is now off `main`, involving changes that have to do with the mcast lifecycle changes. Includes: - Each default can now be set or unset and demoted independently. Unsetting the unicast IPv4 default does not affect the multicast IPv4 default, for example. - Add `pool_type` and `ip_version` columns to `ip_pool_resource` (denormalized from parent `ip_pool` for unique index) - Replace unique index with partial index on (resource_id, pool_type, ip_version) WHERE is_default = true - Rename `IpPoolResourceLink` to `IncompleteIpPoolResource` to reflect that pool_type/ip_version are actually populated by the linking query - Add `ip_version` field to API params for default pool disambiguation - API versioning for backwards compatibility with older clients
zeeshanlakhani
added a commit
that referenced
this pull request
Dec 23, 2025
Previously, each silo could only have one default IP pool. This change allows one default pool per (pool_type, ip_version) combination, enabling silos to have separate defaults for: - Unicast IPv4 - Unicast IPv6 - Multicast IPv4 - Multicast IPv6 This work previously branched off #9451, but is now off `main`, involving changes that have to do with the mcast lifecycle changes. Includes: - Each default can now be set or unset and demoted independently. Unsetting the unicast IPv4 default does not affect the multicast IPv4 default, for example. - Add `pool_type` and `ip_version` columns to `ip_pool_resource` (denormalized from parent `ip_pool` for unique index) - Replace unique index with partial index on (resource_id, pool_type, ip_version) WHERE is_default = true - Rename `IpPoolResourceLink` to `IncompleteIpPoolResource` to reflect that pool_type/ip_version are actually populated by the linking query - Add `ip_version` field to API params for default pool disambiguation - API versioning for backwards compatibility with older clients
Collaborator
Author
|
I'll merge in main once #9687 is in, but this is still reviewable @rcgoodfellow @internet-diglett. |
zeeshanlakhani
force-pushed
the
zl/drop-mvlan-from-group
branch
from
3b7b3ca to
9002d36
Compare
zeeshanlakhani
force-pushed
the
multicast-e2e
branch
4 times, most recently
from
52ad8d8 to
cc63562
Compare
zeeshanlakhani
force-pushed
the
zl/drop-mvlan-from-group
branch
from
4a0d377 to
06466aa
Compare
zeeshanlakhani
force-pushed
the
zl/drop-mvlan-from-group
branch
from
06466aa to
70f8b39
Compare
FelixMcFelix
approved these changes
Mar 13, 2026
Contributor
FelixMcFelix
left a comment
FelixMcFelix
left a comment
There was a problem hiding this comment.
I had a quick look over this again, nothing looks to be out of the ordinary. Thanks!
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Egress multicast (instances sending to external receivers) is not in MVP scope. The mvlan field for VLAN-tagged upstream traffic is unnecessary since it probably will not be attached specifically to a group. Worth revisiting when egress support lands.
This PR also replaces mvlan with has_any_source_member on the multicast group view, which tracks whether any member joined without source filtering, using for source IP logic. The source_ips field now contains only IPs from members that explicitly specified sources, making the semantics clearer. The group-to-view conversion simplifies from TryFrom to From.