From 35540d8b326bffca4bd47b06e40bf27f88c000a6 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 7 Sep 2011 01:30:13 +0000 Subject: [PATCH] add missing files from request-ixfr test --- bin/tests/system/ixfr/ns3/.cvsignore | 3 +++ bin/tests/system/ixfr/ns3/mytest0.db | 15 +++++++++++ bin/tests/system/ixfr/ns3/mytest1.db | 15 +++++++++++ bin/tests/system/ixfr/ns3/mytest2.db | 15 +++++++++++ bin/tests/system/ixfr/ns3/named.conf | 35 ++++++++++++++++++++++++++ bin/tests/system/ixfr/ns3/subtest0.db | 13 ++++++++++ bin/tests/system/ixfr/ns3/subtest1.db | 13 ++++++++++ bin/tests/system/ixfr/ns4/.cvsignore | 3 +++ bin/tests/system/ixfr/ns4/named.conf | 36 +++++++++++++++++++++++++++ 9 files changed, 148 insertions(+) create mode 100644 bin/tests/system/ixfr/ns3/.cvsignore create mode 100644 bin/tests/system/ixfr/ns3/mytest0.db create mode 100644 bin/tests/system/ixfr/ns3/mytest1.db create mode 100644 bin/tests/system/ixfr/ns3/mytest2.db create mode 100644 bin/tests/system/ixfr/ns3/named.conf create mode 100644 bin/tests/system/ixfr/ns3/subtest0.db create mode 100644 bin/tests/system/ixfr/ns3/subtest1.db create mode 100644 bin/tests/system/ixfr/ns4/.cvsignore create mode 100644 bin/tests/system/ixfr/ns4/named.conf diff --git a/bin/tests/system/ixfr/ns3/.cvsignore b/bin/tests/system/ixfr/ns3/.cvsignore new file mode 100644 index 0000000000..5c2431b869 --- /dev/null +++ b/bin/tests/system/ixfr/ns3/.cvsignore @@ -0,0 +1,3 @@ +named.conf +named.run +mytest.db.jnl diff --git a/bin/tests/system/ixfr/ns3/mytest0.db b/bin/tests/system/ixfr/ns3/mytest0.db new file mode 100644 index 0000000000..e7a1bc739d --- /dev/null +++ b/bin/tests/system/ixfr/ns3/mytest0.db @@ -0,0 +1,15 @@ +$ORIGIN test. +$TTL 15 +test. 15 IN SOA ns1.test. hostmaster.test. ( + 1 ; serial + 3H ; refresh + 15 ; retry + 1w ; expire + 3h ; minimum + ) + IN NS ns1.test. + IN NS ns2.test. +ns1 IN A 10.53.0.3 +ns2 IN A 10.53.0.4 +host1 IN A 192.168.10.3 +host2 IN A 192.168.10.4 diff --git a/bin/tests/system/ixfr/ns3/mytest1.db b/bin/tests/system/ixfr/ns3/mytest1.db new file mode 100644 index 0000000000..dfd01561d6 --- /dev/null +++ b/bin/tests/system/ixfr/ns3/mytest1.db @@ -0,0 +1,15 @@ +$ORIGIN test. +$TTL 15 +test. 15 IN SOA ns1.test. hostmaster.test. ( + 2 ; serial + 3H ; refresh + 15 ; retry + 1w ; expire + 3h ; minimum + ) + IN NS ns1.test. + IN NS ns2.test. +ns1 IN A 10.53.0.3 +ns2 IN A 10.53.0.4 +host1 IN A 192.168.10.13 +host2 IN A 192.168.10.4 diff --git a/bin/tests/system/ixfr/ns3/mytest2.db b/bin/tests/system/ixfr/ns3/mytest2.db new file mode 100644 index 0000000000..7cb190ab6f --- /dev/null +++ b/bin/tests/system/ixfr/ns3/mytest2.db @@ -0,0 +1,15 @@ +$ORIGIN test. +$TTL 15 +test. 15 IN SOA ns1.test. hostmaster.test. ( + 4 ; serial + 3H ; refresh + 15 ; retry + 1w ; expire + 3h ; minimum + ) + IN NS ns1.test. + IN NS ns2.test. +ns1 IN A 10.53.0.3 +ns2 IN A 10.53.0.4 +host1 IN A 192.168.10.13 +host2 IN A 192.168.10.14 diff --git a/bin/tests/system/ixfr/ns3/named.conf b/bin/tests/system/ixfr/ns3/named.conf new file mode 100644 index 0000000000..9491d4fb7e --- /dev/null +++ b/bin/tests/system/ixfr/ns3/named.conf @@ -0,0 +1,35 @@ +options { + query-source address 10.53.0.3; + notify-source 10.53.0.3; + transfer-source 10.53.0.3; + allow-transfer { any; }; + port 5300; + pid-file "named.pid"; + listen-on { 10.53.0.3; }; + listen-on-v6 { none; }; + recursion no; + notify yes; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm hmac-md5; +}; + +controls { + inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; +}; + +view "primary" { + ixfr-from-differences yes; + request-ixfr yes; + zone "test" IN { + type master; + file "mytest.db"; + }; + zone "sub.test" IN { + type master; + file "subtest.db"; + request-ixfr no; + }; +}; diff --git a/bin/tests/system/ixfr/ns3/subtest0.db b/bin/tests/system/ixfr/ns3/subtest0.db new file mode 100644 index 0000000000..e7d944b410 --- /dev/null +++ b/bin/tests/system/ixfr/ns3/subtest0.db @@ -0,0 +1,13 @@ +$ORIGIN sub.test. +$TTL 15 +sub.test. 15 IN SOA ns1.test. hostmaster.test. ( + 1 ; serial + 3H ; refresh + 15 ; retry + 1w ; expire + 3h ; minimum + ) + IN NS ns1.test. + IN NS ns2.test. +host3 IN A 192.168.10.23 +host4 IN A 192.168.10.24 diff --git a/bin/tests/system/ixfr/ns3/subtest1.db b/bin/tests/system/ixfr/ns3/subtest1.db new file mode 100644 index 0000000000..ab2994048a --- /dev/null +++ b/bin/tests/system/ixfr/ns3/subtest1.db @@ -0,0 +1,13 @@ +$ORIGIN sub.test. +$TTL 15 +sub.test. 15 IN SOA ns1.test. hostmaster.test. ( + 3 ; serial + 3H ; refresh + 15 ; retry + 1w ; expire + 3h ; minimum + ) + IN NS ns1.test. + IN NS ns2.test. +host3 IN A 192.168.10.123 +host4 IN A 192.168.10.24 diff --git a/bin/tests/system/ixfr/ns4/.cvsignore b/bin/tests/system/ixfr/ns4/.cvsignore new file mode 100644 index 0000000000..5c2431b869 --- /dev/null +++ b/bin/tests/system/ixfr/ns4/.cvsignore @@ -0,0 +1,3 @@ +named.conf +named.run +mytest.db.jnl diff --git a/bin/tests/system/ixfr/ns4/named.conf b/bin/tests/system/ixfr/ns4/named.conf new file mode 100644 index 0000000000..8d0b20e0d0 --- /dev/null +++ b/bin/tests/system/ixfr/ns4/named.conf @@ -0,0 +1,36 @@ +options { + query-source address 10.53.0.4; + notify-source 10.53.0.4; + transfer-source 10.53.0.4; + port 5300; + pid-file "named.pid"; + listen-on { 10.53.0.4; }; + listen-on-v6 { none; }; + recursion no; + notify yes; +}; + +key rndc_key { + secret "1234abcd8765"; + algorithm hmac-md5; +}; + +controls { + inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; }; +}; + +view "primary" { + ixfr-from-differences yes; + request-ixfr yes; + zone "test" IN { + type slave; + file "mytest.db"; + masters { 10.53.0.3; }; + }; + zone "sub.test" IN { + type slave; + file "subtest.db"; + request-ixfr no; + masters { 10.53.0.3; }; + }; +};