5f41d8eb1f
Make normalize return multiple "hosts" (= reverse zones) when a non-octet boundary cidr is given. Added pkg/cidr package that holds the cidr calculation routines; felt they didn't really fit dnsutil. This change means the IPNet return parameter isn't needed, the hosts are all correct. The tests that tests this is also removed: TestSplitHostPortReverse The fallout was that zoneAddr _also_ doesn't need the IPNet member, that in turn make it visible that zoneAddr in address.go duplicated a bunch of stuff from register.go; removed/refactored that too. Created a plugin.OriginsFromArgsOrServerBlock to help plugins do the right things, by consuming ZONE arguments; this now expands reverse zones correctly. This is mostly mechanical. Remove the reverse test in plugin/kubernetes which is a copy-paste from a core test (which has since been fixed). Remove MustNormalize as it has no plugin users. This change is not backwards compatible to plugins that have a ZONE argument that they parse in the setup util. All in-tree plugins have been updated. Signed-off-by: Miek Gieben <miek@miek.nl>
46 lines
1.3 KiB
Go
46 lines
1.3 KiB
Go
package cidr
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
)
|
|
|
|
var tests = []struct {
|
|
in string
|
|
expected []string
|
|
zones []string
|
|
}{
|
|
{"10.0.0.0/15", []string{"10.0.0.0/16", "10.1.0.0/16"}, []string{"0.10.in-addr.arpa.", "1.10.in-addr.arpa."}},
|
|
{"10.0.0.0/16", []string{"10.0.0.0/16"}, []string{"0.10.in-addr.arpa."}},
|
|
{"192.168.1.1/23", []string{"192.168.0.0/24", "192.168.1.0/24"}, []string{"0.168.192.in-addr.arpa.", "1.168.192.in-addr.arpa."}},
|
|
{"10.129.60.0/22", []string{"10.129.60.0/24", "10.129.61.0/24", "10.129.62.0/24", "10.129.63.0/24"}, []string{"60.129.10.in-addr.arpa.", "61.129.10.in-addr.arpa.", "62.129.10.in-addr.arpa.", "63.129.10.in-addr.arpa."}},
|
|
}
|
|
|
|
func TestClass(t *testing.T) {
|
|
for i, tc := range tests {
|
|
_, n, _ := net.ParseCIDR(tc.in)
|
|
nets := Class(n)
|
|
if len(nets) != len(tc.expected) {
|
|
t.Errorf("Test %d, expected %d subnets, got %d", i, len(tc.expected), len(nets))
|
|
continue
|
|
}
|
|
for j := range nets {
|
|
if nets[j] != tc.expected[j] {
|
|
t.Errorf("Test %d, expected %s, got %s", i, tc.expected[j], nets[j])
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestReverse(t *testing.T) {
|
|
for i, tc := range tests {
|
|
_, n, _ := net.ParseCIDR(tc.in)
|
|
nets := Class(n)
|
|
reverse := Reverse(nets)
|
|
for j := range reverse {
|
|
if reverse[j] != tc.zones[j] {
|
|
t.Errorf("Test %d, expected %s, got %s", i, tc.zones[j], reverse[j])
|
|
}
|
|
}
|
|
}
|
|
}
|