Now uses secure-zone and generates expected result files based on that

diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master
index 2077ed0d629182a235dbf94bcaa8641cab3a73cf..ad3346c98d69cf615c546916f8f927a79fcfc430 100644 (file)
--- a/regression-tests/backends/remote-master
+++ b/regression-tests/backends/remote-master
@@ -87,25 +87,35 @@ EOF
                if [ "$remotedosec" = "yes" ]
                then
                        echo "remote-dnssec=yes" >> pdns-remote.conf
-                       ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.ksk ksk
-                       ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.zsk.1 zsk
-                       ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.zsk.2 zsk
-                       ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 1
-                       ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 2
-                       ../pdns/pdnssec --config-dir=. --config-name=remote deactivate-zone-key example.com 3
+#                      ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.ksk ksk
+#                      ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.zsk.1 zsk
+#                      ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.zsk.2 zsk
+#                      ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 1
+#                      ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 2
+#                      ../pdns/pdnssec --config-dir=. --config-name=remote deactivate-zone-key example.com 3
+#
+#                      ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.ksk ksk
+#                      ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.zsk.1 zsk
+#                      ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.zsk.2 zsk
+#                      ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key up.example.com 4
+#                      ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key up.example.com 5
+#                      ../pdns/pdnssec --config-dir=. --config-name=remote deactivate-zone-key up.example.com 6
 
-                       ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.ksk ksk
-                       ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.zsk.1 zsk
-                       ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.zsk.2 zsk
-                       ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key up.example.com 4
-                       ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key up.example.com 5
-                       ../pdns/pdnssec --config-dir=. --config-name=remote deactivate-zone-key up.example.com 6
+                       ../pdns/pdnssec --config-dir=. --config-name=remote secure-zone example.com
+                       ../pdns/pdnssec --config-dir=. --config-name=remote secure-zone up.example.com
+
+                       ./feed_ds.pl up.example.com example.com "../pdns/pdnssec --config-dir=. --config-name=remote" $testsdir/remote.sqlite3
 
                        if [ "$remotesec" = "nsec3" ]
                        then
                                ../pdns/pdnssec --config-dir=. --config-name=remote set-nsec3 example.com
                                ../pdns/pdnssec --config-dir=. --config-name=remote set-nsec3 up.example.com
                        fi
+
+                       # add DS records into list-all-records
+                        ../pdns/pdnssec --config-dir=. --config-name=remote show-zone up.example.com | awk '{ if ($1=="DS") { printf "up.example.com.          120     IN      DS      " $6 " " $7 " " $8 " " substr(toupper($9),0,56); if (length($9)>56) { print " " substr(toupper($9),57) } else { print "" } } }' > $testsdir/list-all-records/expected_dnssec_part2
+                       cat $testsdir/list-all-records/expected_dnssec_part1 $testsdir/list-all-records/expected_dnssec_part2 $testsdir/list-all-records/expected_dnssec_part3 > $testsdir/list-all-records/expected_result.dnssec 
+                       cp -f $testsdir/list-all-records/expected_result.dnssec $testsdir/list-all-records/expected_result.nsec3
                fi
 
                $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \