aboutsummaryrefslogtreecommitdiff
path: root/core/dnsserver/reverse_test.go
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2021-05-17 22:19:54 +0200
committerGravatar GitHub <noreply@github.com> 2021-05-17 13:19:54 -0700
commit5f41d8eb1f74621ada05968dd6b0d24f9ae742df (patch)
tree9a75f00225cea18ea04224d882eb2fc11f5933df /core/dnsserver/reverse_test.go
parent540937964890ad36b56841374f7f83ef7a2a0247 (diff)
downloadcoredns-5f41d8eb1f74621ada05968dd6b0d24f9ae742df.tar.gz
coredns-5f41d8eb1f74621ada05968dd6b0d24f9ae742df.tar.zst
coredns-5f41d8eb1f74621ada05968dd6b0d24f9ae742df.zip
reverse zone: fix Normalize (#4621)
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>
Diffstat (limited to 'core/dnsserver/reverse_test.go')
-rw-r--r--core/dnsserver/reverse_test.go31
1 files changed, 0 insertions, 31 deletions
diff --git a/core/dnsserver/reverse_test.go b/core/dnsserver/reverse_test.go
deleted file mode 100644
index bc6909b8a..000000000
--- a/core/dnsserver/reverse_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package dnsserver
-
-import (
- "net"
- "testing"
-)
-
-func TestClassFromCIDR(t *testing.T) {
- tests := []struct {
- in string
- expected []string
- }{
- {"10.0.0.0/15", []string{"10.0.0.0/16", "10.1.0.0/16"}},
- {"10.0.0.0/16", []string{"10.0.0.0/16"}},
- {"192.168.1.1/23", []string{"192.168.0.0/24", "192.168.1.0/24"}},
- {"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"}},
- }
- for i, tc := range tests {
- _, n, _ := net.ParseCIDR(tc.in)
- nets := classFromCIDR(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])
- }
- }
- }
-}