Skip to content

[DNM] PRE Merge testing BGP IPV6 #2747

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[DNM] PRE Merge testing BGP IPV6 #2747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7def155
Fix UDN service CIDR flows that had protocol prefix pinned to `ip`
tssurya Aug 1, 2025
936faeb
Consider more than 1 family serviceCIDR range for UDN service flows
tssurya Aug 1, 2025
f350f9b
Make ip and ipv6 constants in flow code
tssurya Sep 5, 2025
8628c90
fix stupid conflict
tssurya Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions go-controller/pkg/node/bridgeconfig/bridgeconfig_testutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ func CheckUDNSvcIsolationOVSFlows(flows []string, netConfig *BridgeUDNConfigurat
var protoPrefix string
if net2.IsIPv4CIDR(svcCIDR) {
mgmtMasqIP = netConfig.V4MasqIPs.ManagementPort.IP.String()
protoPrefix = "ip"
protoPrefix = protoPrefixV4
} else {
mgmtMasqIP = netConfig.V6MasqIPs.ManagementPort.IP.String()
protoPrefix = "ip6"
protoPrefix = protoPrefixV6
}

var nFlows int
Expand Down Expand Up @@ -78,11 +78,11 @@ func CheckAdvertisedUDNSvcIsolationOVSFlows(flows []string, netConfig *BridgeUDN
if net2.IsIPv4CIDR(svcCIDR) {
matchingIPFamilySubnet, err = util.MatchFirstIPNetFamily(false, udnAdvertisedSubnets)
Expect(err).ToNot(HaveOccurred())
protoPrefix = "ip"
protoPrefix = protoPrefixV4
} else {
matchingIPFamilySubnet, err = util.MatchFirstIPNetFamily(true, udnAdvertisedSubnets)
Expect(err).ToNot(HaveOccurred())
protoPrefix = "ip6"
protoPrefix = protoPrefixV6
}

var nFlows int
Expand All @@ -107,11 +107,11 @@ func CheckDefaultSvcIsolationOVSFlows(flows []string, defaultConfig *BridgeUDNCo
var masqSubnet string
var protoPrefix string
if net2.IsIPv4CIDR(svcCIDR) {
protoPrefix = "ip"
protoPrefix = protoPrefixV4
masqIP = config.Gateway.MasqueradeIPs.V4HostMasqueradeIP.String()
masqSubnet = config.Gateway.V4MasqueradeSubnet
} else {
protoPrefix = "ip6"
protoPrefix = protoPrefixV6
masqIP = config.Gateway.MasqueradeIPs.V6HostMasqueradeIP.String()
masqSubnet = config.Gateway.V6MasqueradeSubnet
}
Expand Down
Loading