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

inte/networking: add isIPv6 flag

Browse source 
Make sure the `ping` command used by `TestBridgeICC` actually has
the `-6` flag when it runs IPv6 test cases. Without this flag,
IPv6 connectivity isn't tested properly.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
This commit is contained in:
Albin Kerouanton 2023-12-20 23:19:58 +01:00
parent 21835a5696
commit 5a009cdd5b
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
integration/networking/bridge_test.go
View file

@ -36,6 +36,7 @@ func TestBridgeICC(t *testing.T) {
name string
bridgeOpts []func(*types.NetworkCreate)
ctr1MacAddress string
isIPv6 bool
isLinkLocal bool
pingHost string
}{
@ -55,6 +56,7 @@ func TestBridgeICC(t *testing.T) {
network.WithIPv6(),
network.WithIPAM("fdf1:a844:380c:b200::/64", "fdf1:a844:380c:b200::1"),
},
isIPv6: true,
},
{
name: "IPv6 ULA on internal network",
@ -63,6 +65,7 @@ func TestBridgeICC(t *testing.T) {
network.WithInternal(),
network.WithIPAM("fdf1:a844:380c:b247::/64", "fdf1:a844:380c:b247::1"),
},
isIPv6: true,
},
{
name: "IPv6 link-local address on non-internal network",
@ -75,6 +78,7 @@ func TestBridgeICC(t *testing.T) {
network.WithIPAM("fe80::/64", "fe80::1"),
},
isLinkLocal: true,
isIPv6: true,
},
{
name: "IPv6 link-local address on internal network",
@ -85,9 +89,10 @@ func TestBridgeICC(t *testing.T) {
network.WithIPAM("fe80::/64", "fe80::1"),
},
isLinkLocal: true,
isIPv6: true,
},
{
// As for 'LL non-internal', but ping the container by name instead of by address
// As for 'LL non-internal', ping the container by name instead of by address
// - the busybox test containers only have one interface with a link local
// address, so the zone index is not required:
// RFC-4007, section 6: "[...] for nodes with only a single non-loopback
@ -99,6 +104,7 @@ func TestBridgeICC(t *testing.T) {
network.WithIPv6(),
network.WithIPAM("fe80::/64", "fe80::1"),
},
isIPv6: true,
},
{
name: "IPv6 nonstandard link-local subnet on non-internal network ping by name",
@ -111,6 +117,7 @@ func TestBridgeICC(t *testing.T) {
network.WithIPv6(),
network.WithIPAM("fe80:1234::/64", "fe80:1234::1"),
},
isIPv6: true,
},
{
name: "IPv6 non-internal network with SLAAC LL address",
@ -122,6 +129,7 @@ func TestBridgeICC(t *testing.T) {
// specify one here to hardcode the SLAAC LL address below.
ctr1MacAddress: "02:42:ac:11:00:02",
pingHost: "fe80::42:acff:fe11:2%eth0",
isIPv6: true,
},
{
name: "IPv6 internal network with SLAAC LL address",
@ -133,6 +141,7 @@ func TestBridgeICC(t *testing.T) {
// specify one here to hardcode the SLAAC LL address below.
ctr1MacAddress: "02:42:ac:11:00:02",
pingHost: "fe80::42:acff:fe11:2%eth0",
isIPv6: true,
},
}
@ -170,7 +179,12 @@ func TestBridgeICC(t *testing.T) {
}
}
pingCmd := []string{"ping", "-c1", "-W3", pingHost}
ipv := "-4"
if tc.isIPv6 {
ipv = "-6"
}
pingCmd := []string{"ping", "-c1", "-W3", ipv, pingHost}
ctr2Name := fmt.Sprintf("ctr-icc-%d-2", tcID)
attachCtx, cancel := context.WithTimeout(ctx, 5*time.Second)