Merge pull request #95701 from masap/ipset2

ipset: Address a TODO, add test for netmask
This commit is contained in:
Kubernetes Prow Robot
2020-12-08 23:34:50 -08:00
committed by GitHub

View File

@@ -1504,8 +1504,7 @@ func TestValidateEntry(t *testing.T) {
IP: "10.20.30.40",
Protocol: ProtocolTCP,
Port: 53,
// TODO: CIDR /32 may not be valid
Net: "10.20.30.0/24",
Net: "10.20.30.0/24",
},
set: &IPSet{
Name: "abc",
@@ -1617,6 +1616,58 @@ func TestValidateEntry(t *testing.T) {
},
valid: false,
},
{ // case[30]
entry: &Entry{
SetType: HashIPPortNet,
IP: "10.20.30.40",
Protocol: ProtocolTCP,
Port: 53,
Net: "192.168.3.0/0",
},
set: &IPSet{
Name: "net mask boundary 0",
},
valid: true,
},
{ // case[31]
entry: &Entry{
SetType: HashIPPortNet,
IP: "10.20.30.40",
Protocol: ProtocolTCP,
Port: 53,
Net: "192.168.3.0/32",
},
set: &IPSet{
Name: "net mask boundary 32",
},
valid: true,
},
{ // case[32]
entry: &Entry{
SetType: HashIPPortNet,
IP: "10.20.30.40",
Protocol: ProtocolTCP,
Port: 53,
Net: "192.168.3.1/33",
},
set: &IPSet{
Name: "invalid net mask",
},
valid: false,
},
{ // case[33]
entry: &Entry{
SetType: HashIPPortNet,
IP: "10.20.30.40",
Protocol: ProtocolTCP,
Port: 53,
Net: "192.168.3.1/-1",
},
set: &IPSet{
Name: "invalid net mask",
},
valid: false,
},
}
for i := range testCases {
valid := testCases[i].entry.Validate(testCases[i].set)