]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
projects / thirdparty / pdns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dcf858a)
Correct update-delegate-in-between & add mysqldiff
authorRuben d'Arco <cyclops@prof-x.net>
Sat, 18 May 2013 12:18:10 +0000 (14:18 +0200)
committermind04 <mind04@monshouwer.org>
Fri, 12 Jul 2013 15:26:20 +0000 (17:26 +0200)
regression-tests/1dyndns-update-delegate-in-between/command patch | blob | blame | history
regression-tests/1dyndns-update-delegate-in-between/description patch | blob | blame | history
regression-tests/1dyndns-update-delegate-in-between/expected_result patch | blob | blame | history
regression-tests/1dyndns-update-delegate-in-between/expected_result.dnssec patch | blob | blame | history
regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow patch | blob | blame | history
regression-tests/1dyndns-update-delegate-in-between/expected_result.nsec3 patch | blob | blame | history

diff --git a/regression-tests/1dyndns-update-delegate-in-between/command b/regression-tests/1dyndns-update-delegate-in-between/command
index b3a6f44cc5d6d57cc3d5d806c050cf966a55dc3a..a68cf0e365ca577cfebe48de9d717bab584d8096 100755 (executable)
--- a/regression-tests/1dyndns-update-delegate-in-between/command
+++ b/regression-tests/1dyndns-update-delegate-in-between/command
@@ -11,6 +11,8 @@ cleandig c.c.host.test.dyndns ANY dnssec hidesoadetails
 cleandig d.d.host.test.dyndns ANY dnssec hidesoadetails
 cleandig e.e.host.test.dyndns ANY dnssec hidesoadetails
 
+mysqldiff
+
 cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
@@ -20,6 +22,8 @@ send
 answer
 !
 
+mysqldiff 1 "Check if delegate and glue are added correctly."
+
 cleandig a.host.test.dyndns ANY dnssec hidesoadetails
 cleandig b.host.test.dyndns ANY dnssec hidesoadetails
 cleandig c.host.test.dyndns ANY dnssec hidesoadetails
@@ -40,6 +44,8 @@ send
 answer
 !
 
+mysqldiff 2 "Check if delegate is deleted and glue auth=1"
+
 cleandig a.host.test.dyndns ANY dnssec hidesoadetails
 cleandig b.host.test.dyndns ANY dnssec hidesoadetails
 cleandig c.host.test.dyndns ANY dnssec hidesoadetails
@@ -60,6 +66,8 @@ send
 answer
 !
 
+mysqldiff 3 "Check if we are back to normal" 
+
 cleandig a.host.test.dyndns ANY dnssec hidesoadetails
 cleandig b.host.test.dyndns ANY dnssec hidesoadetails
 cleandig c.host.test.dyndns ANY dnssec hidesoadetails
diff --git a/regression-tests/1dyndns-update-delegate-in-between/description b/regression-tests/1dyndns-update-delegate-in-between/description
index e7b732fc962cf51e0e308f3f0892b0ea2d826f31..aa2a022c04569ed26a0a17a7d481648e7e9a6585 100644 (file)
--- a/regression-tests/1dyndns-update-delegate-in-between/description
+++ b/regression-tests/1dyndns-update-delegate-in-between/description
@@ -1,2 +1,2 @@
-This tests adds a delegate between two records. The test validates that re have our ordernames correct when we insert a delegate between two others.
+This tests adds a delegate between two (existing) records. The test validates that we set our ordername correctly.
 It also validates that our cache is correctly purged (when we are selective about it).
\ No newline at end of file
diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result b/regression-tests/1dyndns-update-delegate-in-between/expected_result
index d08142eab136c7593947a69bcc51e69f7921047b..c5c02d0664f8e3b19c403423ede435e034ee3909 100644 (file)
--- a/regression-tests/1dyndns-update-delegate-in-between/expected_result
+++ b/regression-tests/1dyndns-update-delegate-in-between/expected_result
@@ -48,6 +48,12 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
+Check if delegate and glue are added correctly.
+--- Start: diff start step.1 ---
+> c.host.test.dyndns   NS      0       ns1.c.host.test.dyndns  3600
+> ns1.c.host.test.dyndns       A       0       192.168.0.1     3600
+--- End: diff start step.1 ---
+
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
@@ -100,6 +106,12 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
+Check if delegate is deleted and glue auth=1
+--- Start: diff start step.2 ---
+> c.host.test.dyndns   NULL    NULL    NULL    NULL
+> ns1.c.host.test.dyndns       A       0       192.168.0.1     3600
+--- End: diff start step.2 ---
+
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
@@ -150,6 +162,11 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
+Check if we are back to normal
+--- Start: diff start step.3 ---
+no difference
+--- End: diff start step.3 ---
+
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result.dnssec b/regression-tests/1dyndns-update-delegate-in-between/expected_result.dnssec
index bec83f9938681f751b1e25e0729085bcf4ce6bf9..555f22fd2d8a58ab5eb1adf6698a488bc6def354 100644 (file)
--- a/regression-tests/1dyndns-update-delegate-in-between/expected_result.dnssec
+++ b/regression-tests/1dyndns-update-delegate-in-between/expected_result.dnssec
@@ -99,6 +99,12 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
+Check if delegate and glue are added correctly.
+--- Start: diff start step.1 ---
+> c.host.test.dyndns   NS      0       ns1.c.host.test.dyndns  3600    'host c'        0
+> ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    NULL    0
+--- End: diff start step.1 ---
+
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      NSEC    86400   c.host.test.dyndns. A RRSIG NSEC
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
@@ -196,6 +202,12 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
+Check if delegate is deleted and glue auth=1
+--- Start: diff start step.2 ---
+> c.host.test.dyndns   NULL    NULL    NULL    NULL    NULL    1
+> ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    'host c ns1'    1
+--- End: diff start step.2 ---
+
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      NSEC    86400   ns1.c.host.test.dyndns. A RRSIG NSEC
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
@@ -295,6 +307,11 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
+Check if we are back to normal
+--- Start: diff start step.3 ---
+no difference
+--- End: diff start step.3 ---
+
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow b/regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow
index 58295f1b640d0debb1e51a56094afdfa66ed3572..008635edce3633c248d384ca6546210d96c1be85 100644 (file)
--- a/regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow
+++ b/regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow
@@ -113,6 +113,12 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
+Check if delegate and glue are added correctly.
+--- Start: diff start step.1 ---
+> c.host.test.dyndns   NS      0       ns1.c.host.test.dyndns  3600    NULL    0
+> ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    NULL    0
+--- End: diff start step.1 ---
+
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
@@ -224,6 +230,12 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
+Check if delegate is deleted and glue auth=1
+--- Start: diff start step.2 ---
+> c.host.test.dyndns   NULL    NULL    NULL    NULL    ''      1
+> ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    ''      1
+--- End: diff start step.2 ---
+
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
@@ -335,6 +347,11 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
+Check if we are back to normal
+--- Start: diff start step.3 ---
+no difference
+--- End: diff start step.3 ---
+
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result.nsec3 b/regression-tests/1dyndns-update-delegate-in-between/expected_result.nsec3
index e20099d231b205d58d72e56bf72e0ecec0c62280..67eafa690dbf6fe9aa99eeb83e4b7996524c75fa 100644 (file)
--- a/regression-tests/1dyndns-update-delegate-in-between/expected_result.nsec3
+++ b/regression-tests/1dyndns-update-delegate-in-between/expected_result.nsec3
@@ -105,6 +105,12 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
+Check if delegate and glue are added correctly.
+--- Start: diff start step.1 ---
+> c.host.test.dyndns   NS      0       ns1.c.host.test.dyndns  3600    'fgun0ru4oe3g76tr551hg97mpu37b6mi'      0
+> ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    NULL    0
+--- End: diff start step.1 ---
+
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
@@ -122,8 +128,8 @@ Reply to question for qname='a.host.test.dyndns.', qtype=ANY
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
 1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P NS
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
 1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
@@ -157,7 +163,7 @@ Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
 1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR6 A RRSIG
 1      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
+1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd FGUN0RU4OE3G76TR551HG97MPU37B6MI A RRSIG
 1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
@@ -176,8 +182,8 @@ Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
 1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P A RRSIG
-1      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd FQU365VN7BR5CSV8CG6NE9V8HA6D008P NS
+1      fgun0ru4oe3g76tr551hg97mpu37b6mi.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      NSEC3   86400   1 [flags] 1 abcd LRESBBP3LV8BLGJ9FSGTDMM4Q7VJ3D6J
 1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
@@ -208,6 +214,12 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
+Check if delegate is deleted and glue auth=1
+--- Start: diff start step.2 ---
+> c.host.test.dyndns   NULL    NULL    NULL    NULL    'fgun0ru4oe3g76tr551hg97mpu37b6mi'      1
+> ns1.c.host.test.dyndns       A       0       192.168.0.1     3600    '6ovod1m5kossaiiqprlaf42prqrkeaq7'      1
+--- End: diff start step.2 ---
+
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
@@ -311,6 +323,11 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
+Check if we are back to normal
+--- Start: diff start step.3 ---
+no difference
+--- End: diff start step.3 ---
+
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
Unnamed repository; edit this file 'description' to name the repository.