fold in rollover_multisigner

diff --git a/bin/tests/system/rollover_multisigner/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-multisigner.conf.j2
similarity index 93%
rename from bin/tests/system/rollover_multisigner/ns3/named.conf.j2
rename to bin/tests/system/rollover/ns3/named-multisigner.conf.j2
index 1ebeeaaaefdca662b47529b541121b564813cbcb..1eb17dfa007d7255765886cc9b9b6f063da52926 100644 (file)
--- a/bin/tests/system/rollover_multisigner/ns3/named.conf.j2
+++ b/bin/tests/system/rollover/ns3/named-multisigner.conf.j2
@@ -1,4 +1,4 @@
-include "kasp.conf";
+include "policy/multisigner.conf";
 include "named.common.conf";
 
 /* RFC 8901 Multi-signer Model 2. */

diff --git a/bin/tests/system/rollover_multisigner/ns3/kasp.conf.j2 b/bin/tests/system/rollover/ns3/policy/multisigner.conf.j2
similarity index 100%
rename from bin/tests/system/rollover_multisigner/ns3/kasp.conf.j2
rename to bin/tests/system/rollover/ns3/policy/multisigner.conf.j2

diff --git a/bin/tests/system/rollover_multisigner/tests_rollover_multisigner.py b/bin/tests/system/rollover/tests_rollover_multisigner.py
similarity index 98%
rename from bin/tests/system/rollover_multisigner/tests_rollover_multisigner.py
rename to bin/tests/system/rollover/tests_rollover_multisigner.py
index 235ef99b6db68a0e2a2d54a35381b09007270045..7d13d18d1be3254010c65421df37982d53f268ed 100644 (file)
--- a/bin/tests/system/rollover_multisigner/tests_rollover_multisigner.py
+++ b/bin/tests/system/rollover/tests_rollover_multisigner.py
@@ -91,7 +91,12 @@ def bootstrap():
     fake_lifetime(zsk_name, 0)
     render_and_sign_zone(zonename, [ksk_name, zsk_name])
 
-    return {}
+    data = {
+        "testconf": "multisigner",
+        "trust_anchors": [],
+    }
+
+    return data
 
 
 def test_rollover_multisigner(ns3, default_algorithm):

diff --git a/bin/tests/system/rollover_multisigner/ns3/named.common.conf.j2 b/bin/tests/system/rollover_multisigner/ns3/named.common.conf.j2
deleted file mode 120000 (symlink)
index 5dc2617..0000000
--- a/bin/tests/system/rollover_multisigner/ns3/named.common.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover/ns3/named.common.conf.j2
\ No newline at end of file

diff --git a/bin/tests/system/rollover_multisigner/ns3/template.db.in b/bin/tests/system/rollover_multisigner/ns3/template.db.in
deleted file mode 100644 (file)
index 74fa7fa..0000000
--- a/bin/tests/system/rollover_multisigner/ns3/template.db.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$TTL 300
-@              IN      SOA  mname1. . (
-                       1       ; serial
-                       20      ; refresh (20 seconds)
-                       20      ; retry (20 seconds)
-                       1814400 ; expire (3 weeks)
-                       3600    ; minimum (1 hour)
-                       )
-
-                       NS      ns3
-ns3                    A       10.53.0.3
-
-a                      A       10.0.0.1
-b                      A       10.0.0.2
-c                      A       10.0.0.3
-

diff --git a/bin/tests/system/rollover_multisigner/ns3/template.db.j2.manual b/bin/tests/system/rollover_multisigner/ns3/template.db.j2.manual
deleted file mode 120000 (symlink)
index 38619a0..0000000
--- a/bin/tests/system/rollover_multisigner/ns3/template.db.j2.manual
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover/ns3/template.db.j2.manual
\ No newline at end of file