From: Ruben d'Arco Date: Mon, 20 May 2013 18:14:32 +0000 (+0200) Subject: Add mysqldiff to 1dyndns-update-delegate test X-Git-Tag: rec-3.6.0-rc1~556^2~3^2~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e55cdba8126614ca62d2170e2a8ddace12e6cab;p=thirdparty%2Fpdns.git Add mysqldiff to 1dyndns-update-delegate test --- diff --git a/regression-tests/1dyndns-update-delegate/command b/regression-tests/1dyndns-update-delegate/command index 2dcf8de483..eaa23c6a7f 100755 --- a/regression-tests/1dyndns-update-delegate/command +++ b/regression-tests/1dyndns-update-delegate/command @@ -1,25 +1,27 @@ #!/bin/sh cleandig delegate1.test.dyndns ANY hidesoadetails +mysqldiff cleannsupdate < delegate1.test.dyndns NS 0 ns1.delegate1.test.dyndns 3600 +> delegate1.test.dyndns NS 0 ns2.delegate1.test.dyndns 3600 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 +--- End: diff start step.1 --- + Answer: ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 @@ -21,10 +29,22 @@ Answer: 1 delegate2.test.dyndns. IN NS 3600 ns1.delegate2.test.dyndns. 1 delegate2.test.dyndns. IN NS 3600 ns2.example.com. -2 ns1.delegate2.test.dyndns. IN A 3600 192.168.0.3 +2 ns1.delegate2.test.dyndns. IN A 3600 127.0.0.1 2 ns2.example.com. IN A 120 192.168.1.2 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0 Reply to question for qname='delegate2.test.dyndns.', qtype=ANY +Check delegate2 added correctly +--- Start: diff start step.2 --- +> delegate1.test.dyndns NS 0 ns1.delegate1.test.dyndns 3600 +> delegate1.test.dyndns NS 0 ns2.delegate1.test.dyndns 3600 +> delegate2.test.dyndns NS 0 ns1.delegate2.test.dyndns 3600 +> delegate2.test.dyndns NS 0 ns2.example.com 3600 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 +> ns1.delegate2.test.dyndns A 0 127.0.0.1 3600 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 +> ns2.delegate2.test.dyndns A 0 127.0.0.1 3600 +--- End: diff start step.2 --- + Answer: ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 @@ -37,18 +57,28 @@ Reply to question for qname='delegate2.test.dyndns.', qtype=ANY 1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='delegate1.test.dyndns.', qtype=ANY -0 ns1.delegate1.test.dyndns. IN A 3600 192.168.0.1 +0 ns1.delegate1.test.dyndns. IN A 3600 127.0.0.1 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY -0 ns2.delegate1.test.dyndns. IN A 3600 192.168.0.2 +0 ns2.delegate1.test.dyndns. IN A 3600 127.0.0.1 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY -0 ns1.delegate2.test.dyndns. IN A 3600 192.168.0.3 +0 ns1.delegate2.test.dyndns. IN A 3600 127.0.0.1 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY -0 ns2.delegate2.test.dyndns. IN A 3600 192.168.0.4 +0 ns2.delegate2.test.dyndns. IN A 3600 127.0.0.1 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY +check delegate delete +--- Start: diff start step.3 --- +> delegate1.test.dyndns NULL NULL NULL NULL +> delegate2.test.dyndns NULL NULL NULL NULL +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 +> ns1.delegate2.test.dyndns A 0 127.0.0.1 3600 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 +> ns2.delegate2.test.dyndns A 0 127.0.0.1 3600 +--- End: diff start step.3 --- + Answer: ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 @@ -67,3 +97,8 @@ Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY 1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY +Check if glue records are deleted and zone back to how we started +--- Start: diff start step.4 --- +no difference +--- End: diff start step.4 --- + diff --git a/regression-tests/1dyndns-update-delegate/expected_result.dnssec b/regression-tests/1dyndns-update-delegate/expected_result.dnssec new file mode 100644 index 0000000000..6843f73884 --- /dev/null +++ b/regression-tests/1dyndns-update-delegate/expected_result.dnssec @@ -0,0 +1,104 @@ +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='delegate1.test.dyndns.', qtype=ANY +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 delegate1.test.dyndns. IN NS 3600 ns1.delegate1.test.dyndns. +1 delegate1.test.dyndns. IN NS 3600 ns2.delegate1.test.dyndns. +2 ns1.delegate1.test.dyndns. IN A 3600 127.0.0.1 +2 ns2.delegate1.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0 +Reply to question for qname='delegate1.test.dyndns.', qtype=ANY +Check delegate1 added correctly +--- Start: diff start step.1 --- +> delegate1.test.dyndns NS 0 ns1.delegate1.test.dyndns 3600 'delegate1' 0 +> delegate1.test.dyndns NS 0 ns2.delegate1.test.dyndns 3600 'delegate1' 0 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +--- End: diff start step.1 --- + +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 delegate2.test.dyndns. IN NS 3600 ns1.delegate2.test.dyndns. +1 delegate2.test.dyndns. IN NS 3600 ns2.example.com. +2 ns1.delegate2.test.dyndns. IN A 3600 127.0.0.1 +2 ns2.example.com. IN A 120 192.168.1.2 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0 +Reply to question for qname='delegate2.test.dyndns.', qtype=ANY +Check delegate2 added correctly +--- Start: diff start step.2 --- +> delegate1.test.dyndns NS 0 ns1.delegate1.test.dyndns 3600 'delegate1' 0 +> delegate1.test.dyndns NS 0 ns2.delegate1.test.dyndns 3600 'delegate1' 0 +> delegate2.test.dyndns NS 0 ns1.delegate2.test.dyndns 3600 'delegate2' 0 +> delegate2.test.dyndns NS 0 ns2.example.com 3600 'delegate2' 0 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns1.delegate2.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns2.delegate2.test.dyndns A 0 127.0.0.1 3600 NULL 0 +--- End: diff start step.2 --- + +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='delegate2.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='delegate1.test.dyndns.', qtype=ANY +0 ns1.delegate1.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY +0 ns2.delegate1.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY +0 ns1.delegate2.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY +0 ns2.delegate2.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY +check delegate delete +--- Start: diff start step.3 --- +> delegate1.test.dyndns NULL NULL NULL NULL NULL 1 +> delegate2.test.dyndns NULL NULL NULL NULL NULL 1 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 'delegate1 ns1' 1 +> ns1.delegate2.test.dyndns A 0 127.0.0.1 3600 'delegate2 ns1' 1 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 'delegate1 ns2' 1 +> ns2.delegate2.test.dyndns A 0 127.0.0.1 3600 'delegate2 ns2' 1 +--- End: diff start step.3 --- + +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY +Check if glue records are deleted and zone back to how we started +--- Start: diff start step.4 --- +no difference +--- End: diff start step.4 --- + diff --git a/regression-tests/1dyndns-update-delegate/expected_result.narrow b/regression-tests/1dyndns-update-delegate/expected_result.narrow new file mode 100644 index 0000000000..ec250e1a09 --- /dev/null +++ b/regression-tests/1dyndns-update-delegate/expected_result.narrow @@ -0,0 +1,104 @@ +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='delegate1.test.dyndns.', qtype=ANY +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 delegate1.test.dyndns. IN NS 3600 ns1.delegate1.test.dyndns. +1 delegate1.test.dyndns. IN NS 3600 ns2.delegate1.test.dyndns. +2 ns1.delegate1.test.dyndns. IN A 3600 127.0.0.1 +2 ns2.delegate1.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0 +Reply to question for qname='delegate1.test.dyndns.', qtype=ANY +Check delegate1 added correctly +--- Start: diff start step.1 --- +> delegate1.test.dyndns NS 0 ns1.delegate1.test.dyndns 3600 NULL 0 +> delegate1.test.dyndns NS 0 ns2.delegate1.test.dyndns 3600 NULL 0 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +--- End: diff start step.1 --- + +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 delegate2.test.dyndns. IN NS 3600 ns1.delegate2.test.dyndns. +1 delegate2.test.dyndns. IN NS 3600 ns2.example.com. +2 ns1.delegate2.test.dyndns. IN A 3600 127.0.0.1 +2 ns2.example.com. IN A 120 192.168.1.2 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0 +Reply to question for qname='delegate2.test.dyndns.', qtype=ANY +Check delegate2 added correctly +--- Start: diff start step.2 --- +> delegate1.test.dyndns NS 0 ns1.delegate1.test.dyndns 3600 NULL 0 +> delegate1.test.dyndns NS 0 ns2.delegate1.test.dyndns 3600 NULL 0 +> delegate2.test.dyndns NS 0 ns1.delegate2.test.dyndns 3600 NULL 0 +> delegate2.test.dyndns NS 0 ns2.example.com 3600 NULL 0 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns1.delegate2.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns2.delegate2.test.dyndns A 0 127.0.0.1 3600 NULL 0 +--- End: diff start step.2 --- + +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='delegate2.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='delegate1.test.dyndns.', qtype=ANY +0 ns1.delegate1.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY +0 ns2.delegate1.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY +0 ns1.delegate2.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY +0 ns2.delegate2.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY +check delegate delete +--- Start: diff start step.3 --- +> delegate1.test.dyndns NULL NULL NULL NULL '' 1 +> delegate2.test.dyndns NULL NULL NULL NULL '' 1 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 '' 1 +> ns1.delegate2.test.dyndns A 0 127.0.0.1 3600 '' 1 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 '' 1 +> ns2.delegate2.test.dyndns A 0 127.0.0.1 3600 '' 1 +--- End: diff start step.3 --- + +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY +Check if glue records are deleted and zone back to how we started +--- Start: diff start step.4 --- +no difference +--- End: diff start step.4 --- + diff --git a/regression-tests/1dyndns-update-delegate/expected_result.nsec3 b/regression-tests/1dyndns-update-delegate/expected_result.nsec3 new file mode 100644 index 0000000000..d2ec425f4e --- /dev/null +++ b/regression-tests/1dyndns-update-delegate/expected_result.nsec3 @@ -0,0 +1,104 @@ +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='delegate1.test.dyndns.', qtype=ANY +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 delegate1.test.dyndns. IN NS 3600 ns1.delegate1.test.dyndns. +1 delegate1.test.dyndns. IN NS 3600 ns2.delegate1.test.dyndns. +2 ns1.delegate1.test.dyndns. IN A 3600 127.0.0.1 +2 ns2.delegate1.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0 +Reply to question for qname='delegate1.test.dyndns.', qtype=ANY +Check delegate1 added correctly +--- Start: diff start step.1 --- +> delegate1.test.dyndns NS 0 ns1.delegate1.test.dyndns 3600 'h4tlip64juuiun7hbl0bsvqkkshh3pkj' 0 +> delegate1.test.dyndns NS 0 ns2.delegate1.test.dyndns 3600 'h4tlip64juuiun7hbl0bsvqkkshh3pkj' 0 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +--- End: diff start step.1 --- + +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 delegate2.test.dyndns. IN NS 3600 ns1.delegate2.test.dyndns. +1 delegate2.test.dyndns. IN NS 3600 ns2.example.com. +2 ns1.delegate2.test.dyndns. IN A 3600 127.0.0.1 +2 ns2.example.com. IN A 120 192.168.1.2 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0 +Reply to question for qname='delegate2.test.dyndns.', qtype=ANY +Check delegate2 added correctly +--- Start: diff start step.2 --- +> delegate1.test.dyndns NS 0 ns1.delegate1.test.dyndns 3600 'h4tlip64juuiun7hbl0bsvqkkshh3pkj' 0 +> delegate1.test.dyndns NS 0 ns2.delegate1.test.dyndns 3600 'h4tlip64juuiun7hbl0bsvqkkshh3pkj' 0 +> delegate2.test.dyndns NS 0 ns1.delegate2.test.dyndns 3600 'hpnrghdi20c5ikiegdmlcknaqu9a3bg0' 0 +> delegate2.test.dyndns NS 0 ns2.example.com 3600 'hpnrghdi20c5ikiegdmlcknaqu9a3bg0' 0 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns1.delegate2.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns2.delegate2.test.dyndns A 0 127.0.0.1 3600 NULL 0 +--- End: diff start step.2 --- + +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='delegate2.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='delegate1.test.dyndns.', qtype=ANY +0 ns1.delegate1.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY +0 ns2.delegate1.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY +0 ns1.delegate2.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY +0 ns2.delegate2.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY +check delegate delete +--- Start: diff start step.3 --- +> delegate1.test.dyndns NULL NULL NULL NULL 'h4tlip64juuiun7hbl0bsvqkkshh3pkj' 1 +> delegate2.test.dyndns NULL NULL NULL NULL 'hpnrghdi20c5ikiegdmlcknaqu9a3bg0' 1 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 'rcogol03mg1pg3u4338eo0nvvh6bs567' 1 +> ns1.delegate2.test.dyndns A 0 127.0.0.1 3600 'asm440u7p2im2slo6iqo92vfp6jtopa0' 1 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 'oshpf39sqa4j1ciudbbvtb5dkrijnpss' 1 +> ns2.delegate2.test.dyndns A 0 127.0.0.1 3600 'rcd0fo052s6a41ao8ue0b43e1mhv50ds' 1 +--- End: diff start step.3 --- + +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY +Check if glue records are deleted and zone back to how we started +--- Start: diff start step.4 --- +no difference +--- End: diff start step.4 --- + diff --git a/regression-tests/1dyndns-update-delegate/expected_result.nsec3-optout b/regression-tests/1dyndns-update-delegate/expected_result.nsec3-optout new file mode 100644 index 0000000000..9fc61724bd --- /dev/null +++ b/regression-tests/1dyndns-update-delegate/expected_result.nsec3-optout @@ -0,0 +1,104 @@ +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='delegate1.test.dyndns.', qtype=ANY +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 delegate1.test.dyndns. IN NS 3600 ns1.delegate1.test.dyndns. +1 delegate1.test.dyndns. IN NS 3600 ns2.delegate1.test.dyndns. +2 ns1.delegate1.test.dyndns. IN A 3600 127.0.0.1 +2 ns2.delegate1.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0 +Reply to question for qname='delegate1.test.dyndns.', qtype=ANY +Check delegate1 added correctly +--- Start: diff start step.1 --- +> delegate1.test.dyndns NS 0 ns1.delegate1.test.dyndns 3600 NULL 0 +> delegate1.test.dyndns NS 0 ns2.delegate1.test.dyndns 3600 NULL 0 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +--- End: diff start step.1 --- + +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 delegate2.test.dyndns. IN NS 3600 ns1.delegate2.test.dyndns. +1 delegate2.test.dyndns. IN NS 3600 ns2.example.com. +2 ns1.delegate2.test.dyndns. IN A 3600 127.0.0.1 +2 ns2.example.com. IN A 120 192.168.1.2 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0 +Reply to question for qname='delegate2.test.dyndns.', qtype=ANY +Check delegate2 added correctly +--- Start: diff start step.2 --- +> delegate1.test.dyndns NS 0 ns1.delegate1.test.dyndns 3600 NULL 0 +> delegate1.test.dyndns NS 0 ns2.delegate1.test.dyndns 3600 NULL 0 +> delegate2.test.dyndns NS 0 ns1.delegate2.test.dyndns 3600 NULL 0 +> delegate2.test.dyndns NS 0 ns2.example.com 3600 NULL 0 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns1.delegate2.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 NULL 0 +> ns2.delegate2.test.dyndns A 0 127.0.0.1 3600 NULL 0 +--- End: diff start step.2 --- + +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='delegate2.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='delegate1.test.dyndns.', qtype=ANY +0 ns1.delegate1.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY +0 ns2.delegate1.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY +0 ns1.delegate2.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY +0 ns2.delegate2.test.dyndns. IN A 3600 127.0.0.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY +check delegate delete +--- Start: diff start step.3 --- +> delegate1.test.dyndns NULL NULL NULL NULL 'h4tlip64juuiun7hbl0bsvqkkshh3pkj' 1 +> delegate2.test.dyndns NULL NULL NULL NULL 'hpnrghdi20c5ikiegdmlcknaqu9a3bg0' 1 +> ns1.delegate1.test.dyndns A 0 127.0.0.1 3600 'rcogol03mg1pg3u4338eo0nvvh6bs567' 1 +> ns1.delegate2.test.dyndns A 0 127.0.0.1 3600 'asm440u7p2im2slo6iqo92vfp6jtopa0' 1 +> ns2.delegate1.test.dyndns A 0 127.0.0.1 3600 'oshpf39sqa4j1ciudbbvtb5dkrijnpss' 1 +> ns2.delegate2.test.dyndns A 0 127.0.0.1 3600 'rcd0fo052s6a41ao8ue0b43e1mhv50ds' 1 +--- End: diff start step.3 --- + +Answer: +;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id] +;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0 +;; ZONE SECTION: +;test.dyndns. IN SOA + +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY +1 test.dyndns. IN SOA 3600 ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400 +Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY +Check if glue records are deleted and zone back to how we started +--- Start: diff start step.4 --- +no difference +--- End: diff start step.4 --- +