InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate IPv4 IPAM conf from the rest of default bridge conf

Browse Source 
Signed-off-by: Rob Murray <rob.murray@docker.com>
This commit is contained in:
Rob Murray
2024-08-10 18:38:15 +01:00
parent cc538b2bf0
commit fdd2591cbe
3 changed files with 178 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
daemon/daemon_linux_test.go
View File

@@ -363,12 +363,20 @@ func TestIfaceAddrs(t *testing.T) {
createBridge(t, "test", tt.nws...)
ipv4Nw, ipv6Nw, err := ifaceAddrs("test")
ipv4Nw, err := ifaceAddrs("test", netlink.FAMILY_V4)
if err != nil {
t.Fatal(err)
}
ipv6Nw, err := ifaceAddrs("test", netlink.FAMILY_V6)
if err != nil {
t.Fatal(err)
}
assert.Check(t, is.DeepEqual(tt.nws, ipv4Nw,
ipnets := make([]*net.IPNet, len(ipv4Nw))
for i := range ipv4Nw {
ipnets[i] = ipv4Nw[i].IPNet
}
assert.Check(t, is.DeepEqual(ipnets, tt.nws,
cmpopts.SortSlices(func(a, b *net.IPNet) bool { return a.String() < b.String() })))
// IPv6 link-local address
assert.Check(t, is.Len(ipv6Nw, 1))