fold rollover_algo_ksk_zsk into rollover

merge the "rollover_algo_ksk_zsk" test into "rollover"

diff --git a/bin/tests/system/rollover_algo_ksk_zsk/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-algo-ksk-zsk.conf.j2
similarity index 97%
rename from bin/tests/system/rollover_algo_ksk_zsk/ns3/named.conf.j2
rename to bin/tests/system/rollover/ns3/named-algo-ksk-zsk.conf.j2
index 0509116df24490761d62103804fbc0ab2af3c396..995933b45489088c7374d2b6d7536db413b4199f 100644 (file)
--- a/bin/tests/system/rollover_algo_ksk_zsk/ns3/named.conf.j2
+++ b/bin/tests/system/rollover/ns3/named-algo-ksk-zsk.conf.j2
@@ -2,7 +2,7 @@
 {% set policy = "rsasha256" if not alg_roll else "ecdsa256" %}
 {% set zones = ["kasp", "manual"] %}
 
-include "kasp.conf";
+include "policy/ksk-zsk.conf";
 include "named.common.conf";
 
 {% for tld in zones %}

diff --git a/bin/tests/system/rollover/ns3/named-rollover.conf.j2 b/bin/tests/system/rollover/ns3/named-manual.conf.j2
similarity index 100%
rename from bin/tests/system/rollover/ns3/named-rollover.conf.j2
rename to bin/tests/system/rollover/ns3/named-manual.conf.j2

diff --git a/bin/tests/system/rollover_algo_ksk_zsk/ns3/kasp.conf b/bin/tests/system/rollover/ns3/policy/ksk-zsk.conf
similarity index 100%
rename from bin/tests/system/rollover_algo_ksk_zsk/ns3/kasp.conf
rename to bin/tests/system/rollover/ns3/policy/ksk-zsk.conf

diff --git a/bin/tests/system/rollover_algo_ksk_zsk/tests_rollover_algo_ksk_zsk_initial.py b/bin/tests/system/rollover/tests_rollover_algo_ksk_zsk_initial.py
similarity index 98%
rename from bin/tests/system/rollover_algo_ksk_zsk/tests_rollover_algo_ksk_zsk_initial.py
rename to bin/tests/system/rollover/tests_rollover_algo_ksk_zsk_initial.py
index 7ad270f0e7e54a3d7d0a59c83dd4e00eb72e17cc..37df424d8d91cf9c948ff61663eaeeacc8e90a4b 100644 (file)
--- a/bin/tests/system/rollover_algo_ksk_zsk/tests_rollover_algo_ksk_zsk_initial.py
+++ b/bin/tests/system/rollover/tests_rollover_algo_ksk_zsk_initial.py
@@ -24,6 +24,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": "algo-ksk-zsk",
     }
 
     tlds = []

diff --git a/bin/tests/system/rollover_algo_ksk_zsk/tests_rollover_algo_ksk_zsk_reconfig.py b/bin/tests/system/rollover/tests_rollover_algo_ksk_zsk_reconfig.py
similarity index 99%
rename from bin/tests/system/rollover_algo_ksk_zsk/tests_rollover_algo_ksk_zsk_reconfig.py
rename to bin/tests/system/rollover/tests_rollover_algo_ksk_zsk_reconfig.py
index 23b57d809469b6496b28cd787f9d68f57c81295f..f9e97ccd2fd89177ba4642da3724bc5a06637cc9 100644 (file)
--- a/bin/tests/system/rollover_algo_ksk_zsk/tests_rollover_algo_ksk_zsk_reconfig.py
+++ b/bin/tests/system/rollover/tests_rollover_algo_ksk_zsk_reconfig.py
@@ -42,6 +42,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": "algo-ksk-zsk",
     }
 
     tlds = []
@@ -68,7 +69,7 @@ def after_servers_start(ns3, templates):
 
     isctest.kasp.wait_keymgr_done(ns3, "step1.algorithm-roll.kasp")
 
-    templates.render("ns3/named.conf", {"alg_roll": True})
+    templates.render("ns3/named-algo-ksk-zsk.conf", {"alg_roll": True})
     start_time = KeyTimingMetadata.now()
     ns3.reconfigure()
 

diff --git a/bin/tests/system/rollover/tests_rollover_manual.py b/bin/tests/system/rollover/tests_rollover_manual.py
index 9a9012c0a97867613431ce3b9a25e2136223f526..7a8eb68f944f1b6faad1895fe62915834c55256b 100644 (file)
--- a/bin/tests/system/rollover/tests_rollover_manual.py
+++ b/bin/tests/system/rollover/tests_rollover_manual.py
@@ -118,7 +118,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
-        "testconf": "rollover",
+        "testconf": "manual",
     }
     tld = configure_tld("kasp", zones)
     data["tlds"].append("kasp")

diff --git a/bin/tests/system/rollover_algo_ksk_zsk/ns1 b/bin/tests/system/rollover_algo_ksk_zsk/ns1
deleted file mode 120000 (symlink)
index 76608be..0000000
--- a/bin/tests/system/rollover_algo_ksk_zsk/ns1
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns1
\ No newline at end of file

diff --git a/bin/tests/system/rollover_algo_ksk_zsk/ns2 b/bin/tests/system/rollover_algo_ksk_zsk/ns2
deleted file mode 120000 (symlink)
index 41a09bb..0000000
--- a/bin/tests/system/rollover_algo_ksk_zsk/ns2
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns2
\ No newline at end of file

diff --git a/bin/tests/system/rollover_algo_ksk_zsk/ns3/named.common.conf.j2 b/bin/tests/system/rollover_algo_ksk_zsk/ns3/named.common.conf.j2
deleted file mode 120000 (symlink)
index 5dc2617..0000000
--- a/bin/tests/system/rollover_algo_ksk_zsk/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_algo_ksk_zsk/ns3/template.db.j2.manual b/bin/tests/system/rollover_algo_ksk_zsk/ns3/template.db.j2.manual
deleted file mode 120000 (symlink)
index 38619a0..0000000
--- a/bin/tests/system/rollover_algo_ksk_zsk/ns3/template.db.j2.manual
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover/ns3/template.db.j2.manual
\ No newline at end of file

diff --git a/bin/tests/system/rollover_algo_ksk_zsk/ns3/trusted.conf.j2 b/bin/tests/system/rollover_algo_ksk_zsk/ns3/trusted.conf.j2
deleted file mode 120000 (symlink)
index cb0be77..0000000
--- a/bin/tests/system/rollover_algo_ksk_zsk/ns3/trusted.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../_common/trusted.conf.j2
\ No newline at end of file