fold rollover_csk_roll tests into rollover

merge the "rollover_csk_roll1" and "rollover_csk_roll2" system
tests into "rollover".

diff --git a/bin/tests/system/rollover_csk_roll1/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-csk-roll1.conf.j2
similarity index 96%
rename from bin/tests/system/rollover_csk_roll1/ns3/named.conf.j2
rename to bin/tests/system/rollover/ns3/named-csk-roll1.conf.j2
index a0f7970404ad8b853de6cd71dc7c045dc9bae331..fedcb7c8e4db6016253300adcbe17fb4d60945f5 100644 (file)
--- a/bin/tests/system/rollover_csk_roll1/ns3/named.conf.j2
+++ b/bin/tests/system/rollover/ns3/named-csk-roll1.conf.j2
@@ -1,6 +1,6 @@
 {% set zones = ["autosign", "manual"] %}
 
-include "kasp.conf";
+include "policy/csk-roll1.conf";
 include "named.common.conf";
 
 {% for tld in zones %}

diff --git a/bin/tests/system/rollover_csk_roll2/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-csk-roll2.conf.j2
similarity index 96%
rename from bin/tests/system/rollover_csk_roll2/ns3/named.conf.j2
rename to bin/tests/system/rollover/ns3/named-csk-roll2.conf.j2
index 78d302adb212602d1ca79de37752c893e196a887..66e11b8ea82b5aefccc31b2cb6e9d137dc705b32 100644 (file)
--- a/bin/tests/system/rollover_csk_roll2/ns3/named.conf.j2
+++ b/bin/tests/system/rollover/ns3/named-csk-roll2.conf.j2
@@ -1,6 +1,6 @@
 {% set zones = ["autosign", "manual"] %}
 
-include "kasp.conf";
+include "policy/csk-roll2.conf";
 include "named.common.conf";
 
 {% for tld in zones %}

diff --git a/bin/tests/system/rollover_csk_roll1/ns3/kasp.conf b/bin/tests/system/rollover/ns3/policy/csk-roll1.conf
similarity index 100%
rename from bin/tests/system/rollover_csk_roll1/ns3/kasp.conf
rename to bin/tests/system/rollover/ns3/policy/csk-roll1.conf

diff --git a/bin/tests/system/rollover_csk_roll2/ns3/kasp.conf b/bin/tests/system/rollover/ns3/policy/csk-roll2.conf
similarity index 100%
rename from bin/tests/system/rollover_csk_roll2/ns3/kasp.conf
rename to bin/tests/system/rollover/ns3/policy/csk-roll2.conf

diff --git a/bin/tests/system/rollover/setup.py b/bin/tests/system/rollover/setup.py
index ddf07b2df487d9c48e3de4876e774a7f2c38ef08..fb30fbd84ae3c7e753f3915d4fdeb8a0e1b60486 100644 (file)
--- a/bin/tests/system/rollover/setup.py
+++ b/bin/tests/system/rollover/setup.py
@@ -687,7 +687,7 @@ def configure_cskroll1(tld: str, policy: str) -> list[Zone]:
     zones = []
     zone = f"csk-roll1.{tld}"
     cds = "cdnskey,cds:sha384"
-    keygen = EnvCmd("KEYGEN", f"-k {policy} -l kasp.conf")
+    keygen = EnvCmd("KEYGEN", f"-k {policy} -l policy/csk-roll1.conf")
 
     # Step 1:
     # Introduce the first key. This will immediately be active.
@@ -1083,7 +1083,7 @@ def configure_cskroll2(tld: str, policy: str) -> list[Zone]:
     zones = []
     zone = f"csk-roll2.{tld}"
     cds = "cdnskey,cds:sha-256,cds:sha-384"
-    keygen = EnvCmd("KEYGEN", f"-k {policy} -l kasp.conf")
+    keygen = EnvCmd("KEYGEN", f"-k {policy} -l policy/csk-roll2.conf")
 
     # Step 1:
     # Introduce the first key. This will immediately be active.
@@ -1491,7 +1491,7 @@ def configure_enable_dnssec(tld: str, policy: str) -> list[Zone]:
     # initial signing of a zone.
     zones = []
     zone = f"enable-dnssec.{tld}"
-    keygen = EnvCmd("KEYGEN", f"-k {policy} -l kasp.conf")
+    keygen = EnvCmd("KEYGEN", f"-k {policy} -l policy/enable-dnsssec.conf")
 
     # Step 1:
     # This is an unsigned zone and named should perform the initial steps of

diff --git a/bin/tests/system/rollover_csk_roll1/tests_rollover_csk_roll1.py b/bin/tests/system/rollover/tests_rollover_csk_roll1.py
similarity index 99%
rename from bin/tests/system/rollover_csk_roll1/tests_rollover_csk_roll1.py
rename to bin/tests/system/rollover/tests_rollover_csk_roll1.py
index 49f015218ccf81cfb4cfa72b03a47b59f7a83f1b..9cd3ffacb3b34d789ac17773654083c7caa7a0b0 100644 (file)
--- a/bin/tests/system/rollover_csk_roll1/tests_rollover_csk_roll1.py
+++ b/bin/tests/system/rollover/tests_rollover_csk_roll1.py
@@ -65,6 +65,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": POLICY,
     }
 
     tlds = []

diff --git a/bin/tests/system/rollover_csk_roll2/tests_rollover_csk_roll2.py b/bin/tests/system/rollover/tests_rollover_csk_roll2.py
similarity index 99%
rename from bin/tests/system/rollover_csk_roll2/tests_rollover_csk_roll2.py
rename to bin/tests/system/rollover/tests_rollover_csk_roll2.py
index c71a129a0eb1ef9d3131e9d5f077ff0e274b433c..28386e5b9f2636fdde785b924d912fbeb0b688ac 100644 (file)
--- a/bin/tests/system/rollover_csk_roll2/tests_rollover_csk_roll2.py
+++ b/bin/tests/system/rollover/tests_rollover_csk_roll2.py
@@ -68,6 +68,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": POLICY,
     }
 
     tlds = []

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

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

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

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

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

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