github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kube-proxy: don't use invalid cidrs in unit test

Browse Source 
CIDRs like 192.168.200.3/24 and fd00:20::1/64 replaced with
192.168.200.0/24 and fd00:20::/64
This commit is contained in:
Lars Ekman
2024-01-09 07:15:31 +01:00
parent 85097f3d2c
commit 564b80b1e1
3 changed files with 50 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/proxy/util/iptables/traffic_test.go
View File

@@ -48,7 +48,7 @@ func TestNewDetectLocalByCIDR(t *testing.T) {
errExpected: false,
},
{
cidr: "2002::1234:abcd:ffff:c0a8:101/64",
cidr: "2002:0:0:1234::/64",
errExpected: false,
},
{
@@ -56,11 +56,7 @@ func TestNewDetectLocalByCIDR(t *testing.T) {
errExpected: true,
},
{
cidr: "2002::1234:abcd:ffff:c0a8:101",
errExpected: true,
},
{
cidr: "",
cidr: "2002:0:0:1234::",
errExpected: true,
},
{
@@ -94,9 +90,9 @@ func TestDetectLocalByCIDR(t *testing.T) {
expectedIfNotLocalOutput: []string{"!", "-s", "10.0.0.0/14"},
},
{
cidr: "2002::1234:abcd:ffff:c0a8:101/64",
expectedIfLocalOutput: []string{"-s", "2002::1234:abcd:ffff:c0a8:101/64"},
expectedIfNotLocalOutput: []string{"!", "-s", "2002::1234:abcd:ffff:c0a8:101/64"},
cidr: "2002:0:0:1234::/64",
expectedIfLocalOutput: []string{"-s", "2002:0:0:1234::/64"},
expectedIfNotLocalOutput: []string{"!", "-s", "2002:0:0:1234::/64"},
},
}
for _, c := range cases {

36
pkg/proxy/util/utils_test.go
View File

@@ -372,58 +372,58 @@ func TestMapCIDRsByIPFamily(t *testing.T) {
},
{
desc: "want IPv4 and receive IPv6",
ipString: []string{"fd00:20::1/64"},
ipString: []string{"fd00:20::/64"},
wantIPv6: false,
expectCorrect: nil,
expectIncorrect: []string{"fd00:20::1/64"},
expectIncorrect: []string{"fd00:20::/64"},
},
{
desc: "want IPv6 and receive IPv4",
ipString: []string{"192.168.200.2/24"},
ipString: []string{"192.168.200.0/24"},
wantIPv6: true,
expectCorrect: nil,
expectIncorrect: []string{"192.168.200.2/24"},
expectIncorrect: []string{"192.168.200.0/24"},
},
{
desc: "want IPv6 and receive IPv4 and IPv6",
ipString: []string{"192.168.200.2/24", "192.1.34.23/24", "fd00:20::1/64", "2001:db9::3/64"},
ipString: []string{"192.168.200.0/24", "192.1.34.0/24", "fd00:20::/64", "2001:db9::/64"},
wantIPv6: true,
expectCorrect: []string{"fd00:20::1/64", "2001:db9::3/64"},
expectIncorrect: []string{"192.168.200.2/24", "192.1.34.23/24"},
expectCorrect: []string{"fd00:20::/64", "2001:db9::/64"},
expectIncorrect: []string{"192.168.200.0/24", "192.1.34.0/24"},
},
{
desc: "want IPv4 and receive IPv4 and IPv6",
ipString: []string{"192.168.200.2/24", "192.1.34.23/24", "fd00:20::1/64", "2001:db9::3/64"},
ipString: []string{"192.168.200.0/24", "192.1.34.0/24", "fd00:20::/64", "2001:db9::/64"},
wantIPv6: false,
expectCorrect: []string{"192.168.200.2/24", "192.1.34.23/24"},
expectIncorrect: []string{"fd00:20::1/64", "2001:db9::3/64"},
expectCorrect: []string{"192.168.200.0/24", "192.1.34.0/24"},
expectIncorrect: []string{"fd00:20::/64", "2001:db9::/64"},
},
{
desc: "want IPv4 and receive IPv4 only",
ipString: []string{"192.168.200.2/24", "192.1.34.23/24"},
ipString: []string{"192.168.200.0/24", "192.1.34.0/24"},
wantIPv6: false,
expectCorrect: []string{"192.168.200.2/24", "192.1.34.23/24"},
expectCorrect: []string{"192.168.200.0/24", "192.1.34.0/24"},
expectIncorrect: nil,
},
{
desc: "want IPv6 and receive IPv4 only",
ipString: []string{"192.168.200.2/24", "192.1.34.23/24"},
ipString: []string{"192.168.200.0/24", "192.1.34.0/24"},
wantIPv6: true,
expectCorrect: nil,
expectIncorrect: []string{"192.168.200.2/24", "192.1.34.23/24"},
expectIncorrect: []string{"192.168.200.0/24", "192.1.34.0/24"},
},
{
desc: "want IPv4 and receive IPv6 only",
ipString: []string{"fd00:20::1/64", "2001:db9::3/64"},
ipString: []string{"fd00:20::/64", "2001:db9::/64"},
wantIPv6: false,
expectCorrect: nil,
expectIncorrect: []string{"fd00:20::1/64", "2001:db9::3/64"},
expectIncorrect: []string{"fd00:20::/64", "2001:db9::/64"},
},
{
desc: "want IPv6 and receive IPv6 only",
ipString: []string{"fd00:20::1/64", "2001:db9::3/64"},
ipString: []string{"fd00:20::/64", "2001:db9::/64"},
wantIPv6: true,
expectCorrect: []string{"fd00:20::1/64", "2001:db9::3/64"},
expectCorrect: []string{"fd00:20::/64", "2001:db9::/64"},
expectIncorrect: nil,
},
}