fold in rollover-ksk tests

merge the "rollover_ksk_doubleksk" and "rollover_ksk_3crowd" system
tests into "rollover"

diff --git a/bin/tests/system/rollover_ksk_3crowd/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-ksk-3crowd.conf.j2
similarity index 89%
rename from bin/tests/system/rollover_ksk_3crowd/ns3/named.conf.j2
rename to bin/tests/system/rollover/ns3/named-ksk-3crowd.conf.j2
index 86e1941ec13a9823758593baa9dbd5dee7740bb0..83bec5e23e29fb1ea265ba4beb3134770f4086f3 100644 (file)
--- a/bin/tests/system/rollover_ksk_3crowd/ns3/named.conf.j2
+++ b/bin/tests/system/rollover/ns3/named-ksk-3crowd.conf.j2
@@ -1,4 +1,4 @@
-include "kasp.conf";
+include "policy/ksk.conf";
 include "named.common.conf";
 
 zone "three-is-a-crowd.kasp" {

diff --git a/bin/tests/system/rollover_ksk_doubleksk/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-ksk-doubleksk.conf.j2
similarity index 97%
rename from bin/tests/system/rollover_ksk_doubleksk/ns3/named.conf.j2
rename to bin/tests/system/rollover/ns3/named-ksk-doubleksk.conf.j2
index 359e735069f61c81e8a977aafbd58b04c11fe2e3..aad37dad4879b19f6c49b2d7490b7f615e97cbe5 100644 (file)
--- a/bin/tests/system/rollover_ksk_doubleksk/ns3/named.conf.j2
+++ b/bin/tests/system/rollover/ns3/named-ksk-doubleksk.conf.j2
@@ -1,6 +1,6 @@
 {% set zones = ["autosign", "manual"] %}
 
-include "kasp.conf";
+include "policy/ksk.conf";
 include "named.common.conf";
 
 {% for tld in zones %}

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

diff --git a/bin/tests/system/rollover_ksk_doubleksk/tests_rollover_ksk_doubleksk.py b/bin/tests/system/rollover/tests_rollover_ksk_doubleksk.py
similarity index 99%
rename from bin/tests/system/rollover_ksk_doubleksk/tests_rollover_ksk_doubleksk.py
rename to bin/tests/system/rollover/tests_rollover_ksk_doubleksk.py
index 6c7a43e777cd7e323d54bd9157ac652285c33e13..7ae043a9f5c58163adf648ac095b3b032a49777b 100644 (file)
--- a/bin/tests/system/rollover_ksk_doubleksk/tests_rollover_ksk_doubleksk.py
+++ b/bin/tests/system/rollover/tests_rollover_ksk_doubleksk.py
@@ -51,6 +51,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": "ksk-doubleksk",
     }
 
     tlds = []

diff --git a/bin/tests/system/rollover_ksk_3crowd/tests_rollover_three_is_a_crowd.py b/bin/tests/system/rollover/tests_rollover_three_is_a_crowd.py
similarity index 99%
rename from bin/tests/system/rollover_ksk_3crowd/tests_rollover_three_is_a_crowd.py
rename to bin/tests/system/rollover/tests_rollover_three_is_a_crowd.py
index 934343919c95bf7ce90516bef5ff004ecc639192..5a8d5579515bcb9062a3c3f128625eabea5f4a46 100644 (file)
--- a/bin/tests/system/rollover_ksk_3crowd/tests_rollover_three_is_a_crowd.py
+++ b/bin/tests/system/rollover/tests_rollover_three_is_a_crowd.py
@@ -36,6 +36,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": "ksk-3crowd",
     }
 
     tlds = []

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

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

diff --git a/bin/tests/system/rollover_ksk_3crowd/ns3/kasp.conf b/bin/tests/system/rollover_ksk_3crowd/ns3/kasp.conf
deleted file mode 120000 (symlink)
index 3cdfe3d..0000000
--- a/bin/tests/system/rollover_ksk_3crowd/ns3/kasp.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover_ksk_doubleksk/ns3/kasp.conf
\ No newline at end of file

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

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

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