beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

integration/networking: fix TestBridgeICC

Browse source 
This test broke in 98323ac114.

This commit renamed WithMacAddress into WithContainerWideMacAddress.
This helper sets the MacAddress field in container.Config. However, API
v1.44 now ignores this field if the NetworkMode has no matching entry in
EndpointsConfig.

This fix uses the helper WithMacAddress and specify for which
EndpointConfig the MacAddress is specified.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
This commit is contained in:
Sebastiaan van Stijn 2023-11-08 09:45:42 +01:00 committed by Albin Kerouanton
parent c14694a424
commit 58785c2932
No known key found for this signature in database
GPG key ID: 630B8E1DCBDB1864
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
integration/networking/bridge_test.go
View file

@ -33,11 +33,11 @@ func TestBridgeICC(t *testing.T) {
defer c.Close()
testcases := []struct {
name string
bridgeOpts []func(*types.NetworkCreate)
ctr1Opts []func(*container.TestContainerConfig)
linkLocal bool
pingHost string
name string
bridgeOpts []func(*types.NetworkCreate)
ctr1MacAddress string
linkLocal bool
pingHost string
}{
{
name: "IPv4 non-internal network",
@ -92,12 +92,10 @@ func TestBridgeICC(t *testing.T) {
network.WithIPv6(),
network.WithIPAM("fdf1:a844:380c:b247::/64", "fdf1:a844:380c:b247::1"),
},
ctr1Opts: []func(*container.TestContainerConfig){
// Link-local address is derived from the MAC address, so we need to
// specify one here to hardcode the SLAAC LL address below.
container.WithMacAddress("02:42:ac:11:00:02"),
},
pingHost: "fe80::42:acff:fe11:2%eth0",
// Link-local address is derived from the MAC address, so we need to
// specify one here to hardcode the SLAAC LL address below.
ctr1MacAddress: "02:42:ac:11:00:02",
pingHost: "fe80::42:acff:fe11:2%eth0",
},
{
name: "IPv6 internal network with SLAAC LL address",
@ -105,12 +103,10 @@ func TestBridgeICC(t *testing.T) {
network.WithIPv6(),
network.WithIPAM("fdf1:a844:380c:b247::/64", "fdf1:a844:380c:b247::1"),
},
ctr1Opts: []func(*container.TestContainerConfig){
// Link-local address is derived from the MAC address, so we need to
// specify one here to hardcode the SLAAC LL address below.
container.WithMacAddress("02:42:ac:11:00:02"),
},
pingHost: "fe80::42:acff:fe11:2%eth0",
// Link-local address is derived from the MAC address, so we need to
// specify one here to hardcode the SLAAC LL address below.
ctr1MacAddress: "02:42:ac:11:00:02",
pingHost: "fe80::42:acff:fe11:2%eth0",
},
}
@ -125,7 +121,11 @@ func TestBridgeICC(t *testing.T) {
defer network.RemoveNoError(ctx, t, c, bridgeName)
ctr1Name := fmt.Sprintf("ctr-icc-%d-1", tcID)
id1 := container.Run(ctx, t, c, append(tc.ctr1Opts,
var ctr1Opts []func(config *container.TestContainerConfig)
if tc.ctr1MacAddress != "" {
ctr1Opts = append(ctr1Opts, container.WithMacAddress(bridgeName, tc.ctr1MacAddress))
}
id1 := container.Run(ctx, t, c, append(ctr1Opts,
container.WithName(ctr1Name),
container.WithImage("busybox:latest"),
container.WithCmd("top"),