Move ns6 to ns3 in rollover tests

There is no difference, so we are going to make it consistent. This will
make it easier to add a chain of trust for these zones (to be done in
a future commit).

diff --git a/bin/tests/system/rollover-algo-csk/ns6/csk1.conf.j2 b/bin/tests/system/rollover-algo-csk/ns3/csk1.conf.j2
similarity index 100%
rename from bin/tests/system/rollover-algo-csk/ns6/csk1.conf.j2
rename to bin/tests/system/rollover-algo-csk/ns3/csk1.conf.j2

diff --git a/bin/tests/system/rollover-algo-csk/ns6/csk2.conf.j2 b/bin/tests/system/rollover-algo-csk/ns3/csk2.conf.j2
similarity index 100%
rename from bin/tests/system/rollover-algo-csk/ns6/csk2.conf.j2
rename to bin/tests/system/rollover-algo-csk/ns3/csk2.conf.j2

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

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

diff --git a/bin/tests/system/rollover-algo-csk/ns3/template.db.in b/bin/tests/system/rollover-algo-csk/ns3/template.db.in
new file mode 120000 (symlink)
index 0000000..ce6d526
--- /dev/null
+++ b/bin/tests/system/rollover-algo-csk/ns3/template.db.in
@@ -0,0 +1 @@
+../../rollover/ns3/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-algo-csk/ns6/named.common.conf.j2 b/bin/tests/system/rollover-algo-csk/ns6/named.common.conf.j2
deleted file mode 120000 (symlink)
index 6b841ab..0000000
--- a/bin/tests/system/rollover-algo-csk/ns6/named.common.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover-dynamic2inline/ns6/named.common.conf.j2
\ No newline at end of file

diff --git a/bin/tests/system/rollover-algo-csk/ns6/template.db.in b/bin/tests/system/rollover-algo-csk/ns6/template.db.in
deleted file mode 120000 (symlink)
index 2159866..0000000
--- a/bin/tests/system/rollover-algo-csk/ns6/template.db.in
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover-dynamic2inline/ns6/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-algo-csk/setup.sh b/bin/tests/system/rollover-algo-csk/setup.sh
index 200da1388e07d965a9690fd88835e6e4275e9f6c..c9e7ab04e58a7008b69666c77661184f87051368 100644 (file)
--- a/bin/tests/system/rollover-algo-csk/setup.sh
+++ b/bin/tests/system/rollover-algo-csk/setup.sh
@@ -14,7 +14,7 @@
 # shellcheck source=conf.sh
 . ../conf.sh
 
-cd "ns6"
+cd "ns3"
 
 setup() {
   zone="$1"

diff --git a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py b/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py
index 0b96fb7328952552671b11c251571291cc5729e6..a6c1ff81e72573bc350260b7c9bae30c1be978f1 100644 (file)
--- a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py
+++ b/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py
@@ -31,11 +31,11 @@ from rollover.common import (
         param("manual", "csk-algoroll-manual"),
     ],
 )
-def test_algoroll_csk_initial(ns6, tld, policy):
+def test_algoroll_csk_initial(ns3, tld, policy):
     config = ALGOROLL_CONFIG
     zone = f"step1.csk-algorithm-roll.{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone)
+    isctest.kasp.wait_keymgr_done(ns3, zone)
 
     step = {
         "zone": zone,
@@ -45,4 +45,4 @@ def test_algoroll_csk_initial(ns6, tld, policy):
         ],
         "nextev": TIMEDELTA["PT1H"],
     }
-    isctest.kasp.check_rollover_step(ns6, config, policy, step)
+    isctest.kasp.check_rollover_step(ns3, config, policy, step)

diff --git a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py b/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py
index f9d5edb455f8355d4df5b5f2a9e502314d87ca37..e1a7ab7a6cb543e4219865c7eaab477ec9d63968 100644 (file)
--- a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py
+++ b/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py
@@ -39,14 +39,14 @@ TIME_PASSED = 0  # set in reconfigure() fixture
 
 
 @pytest.fixture(scope="module", autouse=True)
-def after_servers_start(ns6, templates):
+def after_servers_start(ns3, templates):
     global TIME_PASSED  # pylint: disable=global-statement
 
-    isctest.kasp.wait_keymgr_done(ns6, "step1.csk-algorithm-roll.kasp")
+    isctest.kasp.wait_keymgr_done(ns3, "step1.csk-algorithm-roll.kasp")
 
-    templates.render("ns6/named.conf", {"csk_roll": True})
+    templates.render("ns3/named.conf", {"csk_roll": True})
     start_time = KeyTimingMetadata.now()
-    ns6.reconfigure()
+    ns3.reconfigure()
 
     # Calculate time passed to correctly check for next key events.
     TIME_PASSED = KeyTimingMetadata.now().value - start_time.value
@@ -59,11 +59,11 @@ def after_servers_start(ns6, templates):
         param("manual"),
     ],
 )
-def test_algoroll_csk_reconfig_step1(tld, ns6, alg, size):
+def test_algoroll_csk_reconfig_step1(tld, ns3, alg, size):
     zone = f"step1.csk-algorithm-roll.{tld}"
     policy = f"{POLICY}-{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     if tld == "manual":
         # Same as initial.
@@ -76,18 +76,18 @@ def test_algoroll_csk_reconfig_step1(tld, ns6, alg, size):
             "manual-mode": True,
             "nextev": None,
         }
-        keys = isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+        keys = isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
         # Check logs.
         tag = keys[0].key.tag
         msg1 = f"keymgr-manual-mode: block retire DNSKEY {zone}/RSASHA256/{tag} (CSK)"
         msg2 = f"keymgr-manual-mode: block new key generation for zone {zone} (policy {policy})"
-        assert msg1 in ns6.log
-        assert msg2 in ns6.log
+        assert msg1 in ns3.log
+        assert msg2 in ns3.log
 
         # Force step.
-        with ns6.watch_log_from_here() as watcher:
-            ns6.rndc(f"dnssec -step {zone}")
+        with ns3.watch_log_from_here() as watcher:
+            ns3.rndc(f"dnssec -step {zone}")
             watcher.wait_for_line(
                 f"zone {zone}/IN (signed): zone_rekey done: key {tag}/RSASHA256"
             )
@@ -105,7 +105,7 @@ def test_algoroll_csk_reconfig_step1(tld, ns6, alg, size):
         # Next key event is when the ecdsa256 keys have been propagated.
         "nextev": ALGOROLL_IPUB,
     }
-    isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+    isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
 
 @pytest.mark.parametrize(
@@ -115,11 +115,11 @@ def test_algoroll_csk_reconfig_step1(tld, ns6, alg, size):
         param("manual"),
     ],
 )
-def test_algoroll_csk_reconfig_step2(tld, ns6, alg, size):
+def test_algoroll_csk_reconfig_step2(tld, ns3, alg, size):
     zone = f"step2.csk-algorithm-roll.{tld}"
     policy = f"{POLICY}-{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     # manual-mode: Nothing changing in the zone, no 'dnssec -step' required.
 
@@ -142,7 +142,7 @@ def test_algoroll_csk_reconfig_step2(tld, ns6, alg, size):
         # the time passed between key creation and invoking 'rndc reconfig'.
         "nextev": ALGOROLL_IPUBC - ALGOROLL_IPUB - TIME_PASSED,
     }
-    isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+    isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
 
 @pytest.mark.parametrize(
@@ -152,11 +152,11 @@ def test_algoroll_csk_reconfig_step2(tld, ns6, alg, size):
         param("manual"),
     ],
 )
-def test_algoroll_csk_reconfig_step3(tld, ns6, alg, size):
+def test_algoroll_csk_reconfig_step3(tld, ns3, alg, size):
     zone = f"step3.csk-algorithm-roll.{tld}"
     policy = f"{POLICY}-{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     if tld == "manual":
         # Same as step 2, but the zone signatures have become OMNIPRESENT.
@@ -170,16 +170,16 @@ def test_algoroll_csk_reconfig_step3(tld, ns6, alg, size):
             "manual-mode": True,
             "nextev": None,
         }
-        keys = isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+        keys = isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
         # Check logs.
         tag = keys[1].key.tag
         msg = f"keymgr-manual-mode: block transition CSK {zone}/ECDSAP256SHA256/{tag} type DS state HIDDEN to state RUMOURED"
-        assert msg in ns6.log
+        assert msg in ns3.log
 
         # Force step.
-        with ns6.watch_log_from_here() as watcher:
-            ns6.rndc(f"dnssec -step {zone}")
+        with ns3.watch_log_from_here() as watcher:
+            ns3.rndc(f"dnssec -step {zone}")
             watcher.wait_for_line(
                 f"zone {zone}/IN (signed): zone_rekey done: key {tag}/ECDSAP256SHA256"
             )
@@ -187,14 +187,14 @@ def test_algoroll_csk_reconfig_step3(tld, ns6, alg, size):
         # Check logs.
         tag = keys[0].key.tag
         msg = f"keymgr-manual-mode: block transition CSK {zone}/RSASHA256/{tag} type DS state OMNIPRESENT to state UNRETENTIVE"
-        if msg in ns6.log:
+        if msg in ns3.log:
             # Force step.
             isctest.log.debug(
                 f"keymgr-manual-mode blocking transition CSK {zone}/RSASHA256/{tag} type DS state OMNIPRESENT to state UNRETENTIVE, step again"
             )
             tag = keys[1].key.tag
-            with ns6.watch_log_from_here() as watcher:
-                ns6.rndc(f"dnssec -step {zone}")
+            with ns3.watch_log_from_here() as watcher:
+                ns3.rndc(f"dnssec -step {zone}")
                 watcher.wait_for_line(
                     f"zone {zone}/IN (signed): zone_rekey done: key {tag}/ECDSAP256SHA256"
                 )
@@ -211,7 +211,7 @@ def test_algoroll_csk_reconfig_step3(tld, ns6, alg, size):
         # after the publication interval of the parent side.
         "nextev": ALGOROLL_IRETKSK - TIME_PASSED,
     }
-    isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+    isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
 
 @pytest.mark.parametrize(
@@ -221,11 +221,11 @@ def test_algoroll_csk_reconfig_step3(tld, ns6, alg, size):
         param("manual"),
     ],
 )
-def test_algoroll_csk_reconfig_step4(tld, ns6, alg, size):
+def test_algoroll_csk_reconfig_step4(tld, ns3, alg, size):
     zone = f"step4.csk-algorithm-roll.{tld}"
     policy = f"{POLICY}-{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     if tld == "manual":
         # Same as step 3, but the DS has become HIDDEN/OMNIPRESENT.
@@ -239,17 +239,17 @@ def test_algoroll_csk_reconfig_step4(tld, ns6, alg, size):
             "manual-mode": True,
             "nextev": None,
         }
-        keys = isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+        keys = isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
         # Check logs.
         tag = keys[0].key.tag
         msg = f"keymgr-manual-mode: block transition CSK {zone}/RSASHA256/{tag} type DNSKEY state OMNIPRESENT to state UNRETENTIVE"
-        assert msg in ns6.log
+        assert msg in ns3.log
 
         # Force step.
         tag = keys[1].key.tag
-        with ns6.watch_log_from_here() as watcher:
-            ns6.rndc(f"dnssec -step {zone}")
+        with ns3.watch_log_from_here() as watcher:
+            ns3.rndc(f"dnssec -step {zone}")
             watcher.wait_for_line(
                 f"zone {zone}/IN (signed): zone_rekey done: key {tag}/ECDSAP256SHA256"
             )
@@ -266,7 +266,7 @@ def test_algoroll_csk_reconfig_step4(tld, ns6, alg, size):
         # This happens after the DNSKEY TTL plus zone propagation delay.
         "nextev": ALGOROLL_KEYTTLPROP,
     }
-    isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+    isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
 
 @pytest.mark.parametrize(
@@ -276,11 +276,11 @@ def test_algoroll_csk_reconfig_step4(tld, ns6, alg, size):
         param("manual"),
     ],
 )
-def test_algoroll_csk_reconfig_step5(tld, ns6, alg, size):
+def test_algoroll_csk_reconfig_step5(tld, ns3, alg, size):
     zone = f"step5.csk-algorithm-roll.{tld}"
     policy = f"{POLICY}-{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     # manual-mode: Nothing changing in the zone, no 'dnssec -step' required.
 
@@ -300,7 +300,7 @@ def test_algoroll_csk_reconfig_step5(tld, ns6, alg, size):
         # between key creation and invoking 'rndc reconfig'.
         "nextev": ALGOROLL_IRET - ALGOROLL_IRETKSK - ALGOROLL_KEYTTLPROP - TIME_PASSED,
     }
-    isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+    isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
 
 @pytest.mark.parametrize(
@@ -310,11 +310,11 @@ def test_algoroll_csk_reconfig_step5(tld, ns6, alg, size):
         param("manual"),
     ],
 )
-def test_algoroll_csk_reconfig_step6(tld, ns6, alg, size):
+def test_algoroll_csk_reconfig_step6(tld, ns3, alg, size):
     zone = f"step6.csk-algorithm-roll.{tld}"
     policy = f"{POLICY}-{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     # manual-mode: Nothing changing in the zone, no 'dnssec -step' required.
 
@@ -333,4 +333,4 @@ def test_algoroll_csk_reconfig_step6(tld, ns6, alg, size):
         # Include hidden keys in output.
         "verbose": True,
     }
-    isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+    isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)

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

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
new file mode 120000 (symlink)
index 0000000..5dc2617
--- /dev/null
+++ b/bin/tests/system/rollover-algo-ksk-zsk/ns3/named.common.conf.j2
@@ -0,0 +1 @@
+../../rollover/ns3/named.common.conf.j2
\ No newline at end of file

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

diff --git a/bin/tests/system/rollover-algo-ksk-zsk/ns3/template.db.in b/bin/tests/system/rollover-algo-ksk-zsk/ns3/template.db.in
new file mode 120000 (symlink)
index 0000000..ce6d526
--- /dev/null
+++ b/bin/tests/system/rollover-algo-ksk-zsk/ns3/template.db.in
@@ -0,0 +1 @@
+../../rollover/ns3/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-algo-ksk-zsk/ns6/named.common.conf.j2 b/bin/tests/system/rollover-algo-ksk-zsk/ns6/named.common.conf.j2
deleted file mode 120000 (symlink)
index 6b841ab..0000000
--- a/bin/tests/system/rollover-algo-ksk-zsk/ns6/named.common.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover-dynamic2inline/ns6/named.common.conf.j2
\ No newline at end of file

diff --git a/bin/tests/system/rollover-algo-ksk-zsk/ns6/template.db.in b/bin/tests/system/rollover-algo-ksk-zsk/ns6/template.db.in
deleted file mode 120000 (symlink)
index 2159866..0000000
--- a/bin/tests/system/rollover-algo-ksk-zsk/ns6/template.db.in
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover-dynamic2inline/ns6/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-algo-ksk-zsk/setup.sh b/bin/tests/system/rollover-algo-ksk-zsk/setup.sh
index db27d74e7195246a442d3a9676326fce7eb107d8..bc651b9420842d7171321b9dfd90626a80c8d3ac 100644 (file)
--- a/bin/tests/system/rollover-algo-ksk-zsk/setup.sh
+++ b/bin/tests/system/rollover-algo-ksk-zsk/setup.sh
@@ -14,7 +14,7 @@
 # shellcheck source=conf.sh
 . ../conf.sh
 
-cd "ns6"
+cd "ns3"
 
 setup() {
   zone="$1"

diff --git a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py b/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py
index 1617a40b5bc5c59a653dc7fcc47ef0d46f5b51c4..32eea7d014ae988d50634d38303628fd350b082e 100644 (file)
--- a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py
+++ b/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py
@@ -31,12 +31,12 @@ from rollover.common import (
         param("manual"),
     ],
 )
-def test_algoroll_ksk_zsk_initial(ns6, tld):
+def test_algoroll_ksk_zsk_initial(ns3, tld):
     config = ALGOROLL_CONFIG
     policy = f"rsasha256-{tld}"
     zone = f"step1.algorithm-roll.{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone)
+    isctest.kasp.wait_keymgr_done(ns3, zone)
 
     step = {
         "zone": zone,
@@ -47,4 +47,4 @@ def test_algoroll_ksk_zsk_initial(ns6, tld):
         ],
         "nextev": TIMEDELTA["PT1H"],
     }
-    isctest.kasp.check_rollover_step(ns6, config, policy, step)
+    isctest.kasp.check_rollover_step(ns3, config, policy, step)

diff --git a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py b/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py
index 228e65045e016375dceda4028380c35257705764..15cf0f9ddd263f4f4afd4980fd59aa501fc9d8d7 100644 (file)
--- a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py
+++ b/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py
@@ -39,14 +39,14 @@ TIME_PASSED = 0  # set in reconfigure() fixture
 
 
 @pytest.fixture(scope="module", autouse=True)
-def after_servers_start(ns6, templates):
+def after_servers_start(ns3, templates):
     global TIME_PASSED  # pylint: disable=global-statement
 
-    isctest.kasp.wait_keymgr_done(ns6, "step1.algorithm-roll.kasp")
+    isctest.kasp.wait_keymgr_done(ns3, "step1.algorithm-roll.kasp")
 
-    templates.render("ns6/named.conf", {"alg_roll": True})
+    templates.render("ns3/named.conf", {"alg_roll": True})
     start_time = KeyTimingMetadata.now()
-    ns6.reconfigure()
+    ns3.reconfigure()
 
     # Calculate time passed to correctly check for next key events.
     TIME_PASSED = KeyTimingMetadata.now().value - start_time.value
@@ -59,11 +59,11 @@ def after_servers_start(ns6, templates):
         param("manual"),
     ],
 )
-def test_algoroll_ksk_zsk_reconfig_step1(tld, ns6, alg, size):
+def test_algoroll_ksk_zsk_reconfig_step1(tld, ns3, alg, size):
     zone = f"step1.algorithm-roll.{tld}"
     policy = f"{POLICY}-{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     if tld == "manual":
         # Same as initial.
@@ -77,7 +77,7 @@ def test_algoroll_ksk_zsk_reconfig_step1(tld, ns6, alg, size):
             "manual-mode": True,
             "nextev": None,
         }
-        keys = isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+        keys = isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
         # Check logs.
         ktag = keys[0].key.tag
@@ -85,13 +85,13 @@ def test_algoroll_ksk_zsk_reconfig_step1(tld, ns6, alg, size):
         msg1 = f"keymgr-manual-mode: block retire DNSKEY {zone}/RSASHA256/{ktag} (KSK)"
         msg2 = f"keymgr-manual-mode: block retire DNSKEY {zone}/RSASHA256/{ztag} (ZSK)"
         msg3 = f"keymgr-manual-mode: block new key generation for zone {zone} (policy {policy})"  # twice
-        assert msg1 in ns6.log
-        assert msg2 in ns6.log
-        assert len(ns6.log.grep(msg3)) >= 2
+        assert msg1 in ns3.log
+        assert msg2 in ns3.log
+        assert len(ns3.log.grep(msg3)) == 2
 
         # Force step.
-        with ns6.watch_log_from_here() as watcher:
-            ns6.rndc(f"dnssec -step {zone}")
+        with ns3.watch_log_from_here() as watcher:
+            ns3.rndc(f"dnssec -step {zone}")
             watcher.wait_for_line(
                 f"zone {zone}/IN (signed): zone_rekey done: key {ktag}/RSASHA256"
             )
@@ -110,7 +110,7 @@ def test_algoroll_ksk_zsk_reconfig_step1(tld, ns6, alg, size):
         # Next key event is when the ecdsa256 keys have been propagated.
         "nextev": ALGOROLL_IPUB,
     }
-    isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+    isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
 
 @pytest.mark.parametrize(
@@ -120,11 +120,11 @@ def test_algoroll_ksk_zsk_reconfig_step1(tld, ns6, alg, size):
         param("manual"),
     ],
 )
-def test_algoroll_ksk_zsk_reconfig_step2(tld, ns6, alg, size):
+def test_algoroll_ksk_zsk_reconfig_step2(tld, ns3, alg, size):
     zone = f"step2.algorithm-roll.{tld}"
     policy = f"{POLICY}-{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     # manual-mode: Nothing changing in the zone, no 'dnssec -step' required.
 
@@ -149,7 +149,7 @@ def test_algoroll_ksk_zsk_reconfig_step2(tld, ns6, alg, size):
         # key creation and invoking 'rndc reconfig'.
         "nextev": ALGOROLL_IPUBC - ALGOROLL_IPUB - TIME_PASSED,
     }
-    isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+    isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
 
 @pytest.mark.parametrize(
@@ -159,11 +159,11 @@ def test_algoroll_ksk_zsk_reconfig_step2(tld, ns6, alg, size):
         param("manual"),
     ],
 )
-def test_algoroll_ksk_zsk_reconfig_step3(tld, ns6, alg, size):
+def test_algoroll_ksk_zsk_reconfig_step3(tld, ns3, alg, size):
     zone = f"step3.algorithm-roll.{tld}"
     policy = f"{POLICY}-{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     if tld == "manual":
         # Same as step 2, but the zone signatures have become OMNIPRESENT.
@@ -179,16 +179,16 @@ def test_algoroll_ksk_zsk_reconfig_step3(tld, ns6, alg, size):
             "manual-mode": True,
             "nextev": None,
         }
-        keys = isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+        keys = isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
         # Check logs.
         tag = keys[2].key.tag
         msg = f"keymgr-manual-mode: block transition KSK {zone}/ECDSAP256SHA256/{tag} type DS state HIDDEN to state RUMOURED"
-        assert msg in ns6.log
+        assert msg in ns3.log
 
         # Force step.
-        with ns6.watch_log_from_here() as watcher:
-            ns6.rndc(f"dnssec -step {zone}")
+        with ns3.watch_log_from_here() as watcher:
+            ns3.rndc(f"dnssec -step {zone}")
             watcher.wait_for_line(
                 f"zone {zone}/IN (signed): zone_rekey done: key {tag}/ECDSAP256SHA256"
             )
@@ -196,14 +196,14 @@ def test_algoroll_ksk_zsk_reconfig_step3(tld, ns6, alg, size):
         # Check logs.
         tag = keys[0].key.tag
         msg = f"keymgr-manual-mode: block transition KSK {zone}/RSASHA256/{tag} type DS state OMNIPRESENT to state UNRETENTIVE"
-        if msg in ns6.log:
+        if msg in ns3.log:
             # Force step.
             isctest.log.debug(
                 f"keymgr-manual-mode blocking transition CSK {zone}/RSASHA256/{tag} type DS state OMNIPRESENT to state UNRETENTIVE, step again"
             )
             tag = keys[2].key.tag
-            with ns6.watch_log_from_here() as watcher:
-                ns6.rndc(f"dnssec -step {zone}")
+            with ns3.watch_log_from_here() as watcher:
+                ns3.rndc(f"dnssec -step {zone}")
                 watcher.wait_for_line(
                     f"zone {zone}/IN (signed): zone_rekey done: key {tag}/ECDSAP256SHA256"
                 )
@@ -222,7 +222,7 @@ def test_algoroll_ksk_zsk_reconfig_step3(tld, ns6, alg, size):
         # after the retire interval.
         "nextev": ALGOROLL_IRETKSK - TIME_PASSED,
     }
-    isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+    isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
 
 @pytest.mark.parametrize(
@@ -232,11 +232,11 @@ def test_algoroll_ksk_zsk_reconfig_step3(tld, ns6, alg, size):
         param("manual"),
     ],
 )
-def test_algoroll_ksk_zsk_reconfig_step4(tld, ns6, alg, size):
+def test_algoroll_ksk_zsk_reconfig_step4(tld, ns3, alg, size):
     zone = f"step4.algorithm-roll.{tld}"
     policy = f"{POLICY}-{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     if tld == "manual":
         # Same as step 3, but the DS has become HIDDEN/OMNIPRESENT.
@@ -252,20 +252,20 @@ def test_algoroll_ksk_zsk_reconfig_step4(tld, ns6, alg, size):
             "manual-mode": True,
             "nextev": None,
         }
-        keys = isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+        keys = isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
         # Check logs.
         ktag = keys[0].key.tag
         ztag = keys[1].key.tag
         msg1 = f"keymgr-manual-mode: block transition KSK {zone}/RSASHA256/{ktag} type DNSKEY state OMNIPRESENT to state UNRETENTIVE"
         msg2 = f"keymgr-manual-mode: block transition ZSK {zone}/RSASHA256/{ztag} type DNSKEY state OMNIPRESENT to state UNRETENTIVE"
-        assert msg1 in ns6.log
-        assert msg2 in ns6.log
+        assert msg1 in ns3.log
+        assert msg2 in ns3.log
 
         # Force step.
         ktag = keys[3].key.tag
-        with ns6.watch_log_from_here() as watcher:
-            ns6.rndc(f"dnssec -step {zone}")
+        with ns3.watch_log_from_here() as watcher:
+            ns3.rndc(f"dnssec -step {zone}")
             watcher.wait_for_line(
                 f"zone {zone}/IN (signed): zone_rekey done: key {ktag}/ECDSAP256SHA256"
             )
@@ -284,7 +284,7 @@ def test_algoroll_ksk_zsk_reconfig_step4(tld, ns6, alg, size):
         # This happens after the DNSKEY TTL plus zone propagation delay.
         "nextev": ALGOROLL_KEYTTLPROP,
     }
-    isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+    isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
 
 @pytest.mark.parametrize(
@@ -294,11 +294,11 @@ def test_algoroll_ksk_zsk_reconfig_step4(tld, ns6, alg, size):
         param("manual"),
     ],
 )
-def test_algoroll_ksk_zsk_reconfig_step5(tld, ns6, alg, size):
+def test_algoroll_ksk_zsk_reconfig_step5(tld, ns3, alg, size):
     zone = f"step5.algorithm-roll.{tld}"
     policy = f"{POLICY}-{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     # manual-mode: Nothing changing in the zone, no 'dnssec -step' required.
 
@@ -322,7 +322,7 @@ def test_algoroll_ksk_zsk_reconfig_step5(tld, ns6, alg, size):
         # Include hidden keys in output.
         "verbose": True,
     }
-    isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+    isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)
 
 
 @pytest.mark.parametrize(
@@ -332,11 +332,11 @@ def test_algoroll_ksk_zsk_reconfig_step5(tld, ns6, alg, size):
         param("manual"),
     ],
 )
-def test_algoroll_ksk_zsk_reconfig_step6(tld, ns6, alg, size):
+def test_algoroll_ksk_zsk_reconfig_step6(tld, ns3, alg, size):
     zone = f"step6.algorithm-roll.{tld}"
     policy = f"{POLICY}-{tld}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     # manual-mode: Nothing changing in the zone, no 'dnssec -step' required.
 
@@ -357,4 +357,4 @@ def test_algoroll_ksk_zsk_reconfig_step6(tld, ns6, alg, size):
         # Include hidden keys in output.
         "verbose": True,
     }
-    isctest.kasp.check_rollover_step(ns6, CONFIG, policy, step)
+    isctest.kasp.check_rollover_step(ns3, CONFIG, policy, step)

diff --git a/bin/tests/system/rollover-dynamic2inline/ns6/dynamic2inline.kasp.db b/bin/tests/system/rollover-dynamic2inline/ns3/dynamic2inline.kasp.db
similarity index 100%
rename from bin/tests/system/rollover-dynamic2inline/ns6/dynamic2inline.kasp.db
rename to bin/tests/system/rollover-dynamic2inline/ns3/dynamic2inline.kasp.db

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

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

diff --git a/bin/tests/system/rollover-dynamic2inline/ns3/template.db.in b/bin/tests/system/rollover-dynamic2inline/ns3/template.db.in
new file mode 120000 (symlink)
index 0000000..ce6d526
--- /dev/null
+++ b/bin/tests/system/rollover-dynamic2inline/ns3/template.db.in
@@ -0,0 +1 @@
+../../rollover/ns3/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-dynamic2inline/ns6/named.common.conf.j2 b/bin/tests/system/rollover-dynamic2inline/ns6/named.common.conf.j2
deleted file mode 100644 (file)
index 9299c97..0000000
--- a/bin/tests/system/rollover-dynamic2inline/ns6/named.common.conf.j2
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-options {
-       query-source address 10.53.0.6;
-       notify-source 10.53.0.6;
-       transfer-source 10.53.0.6;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.6; };
-       listen-on-v6 { none; };
-       allow-transfer { any; };
-       recursion no;
-       key-directory ".";
-       dnssec-validation no;
-};
-
-key rndc_key {
-       secret "1234abcd8765";
-       algorithm @DEFAULT_HMAC@;
-};
-
-controls {
-       inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};

diff --git a/bin/tests/system/rollover-dynamic2inline/ns6/template.db.in b/bin/tests/system/rollover-dynamic2inline/ns6/template.db.in
deleted file mode 100644 (file)
index f1d8b94..0000000
--- a/bin/tests/system/rollover-dynamic2inline/ns6/template.db.in
+++ /dev/null
@@ -1,27 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0.  If a copy of the MPL was not distributed with this
-; file, you can obtain one at https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$TTL 300
-@              IN      SOA  mname1. . (
-                       1       ; serial
-                       20      ; refresh (20 seconds)
-                       20      ; retry (20 seconds)
-                       1814400 ; expire (3 weeks)
-                       3600    ; minimum (1 hour)
-                       )
-
-                       NS      ns6
-ns6                    A       10.53.0.6
-
-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-dynamic2inline/tests_rollover_dynamic2inline.py b/bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py
index 5570ce070fb30527c10f85c0443e6edbbd145508..7ec859119538a4ed1a1e10527057c6207936c671 100644 (file)
--- a/bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py
+++ b/bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py
@@ -21,12 +21,12 @@ from rollover.common import (
 )
 
 
-def test_dynamic2inline(alg, size, ns6, templates):
+def test_dynamic2inline(alg, size, ns3, templates):
     config = DEFAULT_CONFIG
     policy = "default"
     zone = "dynamic2inline.kasp"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone)
+    isctest.kasp.wait_keymgr_done(ns3, zone)
 
     step = {
         "zone": zone,
@@ -37,10 +37,10 @@ def test_dynamic2inline(alg, size, ns6, templates):
         "nextev": None,
     }
 
-    isctest.kasp.check_rollover_step(ns6, config, policy, step)
+    isctest.kasp.check_rollover_step(ns3, config, policy, step)
 
-    templates.render("ns6/named.conf", {"change_lifetime": True})
-    ns6.reconfigure()
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    templates.render("ns3/named.conf", {"change_lifetime": True})
+    ns3.reconfigure()
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
-    isctest.kasp.check_rollover_step(ns6, config, policy, step)
+    isctest.kasp.check_rollover_step(ns3, config, policy, step)

diff --git a/bin/tests/system/rollover-going-insecure/ns6/kasp.conf.j2 b/bin/tests/system/rollover-going-insecure/ns3/kasp.conf.j2
similarity index 100%
rename from bin/tests/system/rollover-going-insecure/ns6/kasp.conf.j2
rename to bin/tests/system/rollover-going-insecure/ns3/kasp.conf.j2

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

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

diff --git a/bin/tests/system/rollover-going-insecure/ns3/template.db.in b/bin/tests/system/rollover-going-insecure/ns3/template.db.in
new file mode 120000 (symlink)
index 0000000..ce6d526
--- /dev/null
+++ b/bin/tests/system/rollover-going-insecure/ns3/template.db.in
@@ -0,0 +1 @@
+../../rollover/ns3/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-going-insecure/ns6/named.common.conf.j2 b/bin/tests/system/rollover-going-insecure/ns6/named.common.conf.j2
deleted file mode 120000 (symlink)
index 6b841ab..0000000
--- a/bin/tests/system/rollover-going-insecure/ns6/named.common.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover-dynamic2inline/ns6/named.common.conf.j2
\ No newline at end of file

diff --git a/bin/tests/system/rollover-going-insecure/ns6/template.db.in b/bin/tests/system/rollover-going-insecure/ns6/template.db.in
deleted file mode 120000 (symlink)
index 2159866..0000000
--- a/bin/tests/system/rollover-going-insecure/ns6/template.db.in
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover-dynamic2inline/ns6/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-going-insecure/setup.sh b/bin/tests/system/rollover-going-insecure/setup.sh
index f5d9da48a7ee2b0597d45a5c33e680337537f3b3..11213c1c83433ef4d08415d211ad5978fb887c0d 100644 (file)
--- a/bin/tests/system/rollover-going-insecure/setup.sh
+++ b/bin/tests/system/rollover-going-insecure/setup.sh
@@ -14,7 +14,7 @@
 # shellcheck source=conf.sh
 . ../conf.sh
 
-cd "ns6"
+cd "ns3"
 
 setup() {
   zone="$1"

diff --git a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py b/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py
index dbfb485c5a973cdf988e18a248f8888a34082370..61aa583f554abcc3819af33ffb3b8c8908eeaa74 100644 (file)
--- a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py
+++ b/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py
@@ -31,12 +31,12 @@ from rollover.common import (
         "going-insecure-dynamic.kasp",
     ],
 )
-def test_going_insecure_initial(zone, ns6, alg, size):
+def test_going_insecure_initial(zone, ns3, alg, size):
     config = UNSIGNING_CONFIG
     policy = "unsigning"
     zone = f"step1.{zone}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone)
+    isctest.kasp.wait_keymgr_done(ns3, zone)
 
     step = {
         "zone": zone,
@@ -47,4 +47,4 @@ def test_going_insecure_initial(zone, ns6, alg, size):
         ],
         "nextev": None,
     }
-    isctest.kasp.check_rollover_step(ns6, config, policy, step)
+    isctest.kasp.check_rollover_step(ns3, config, policy, step)

diff --git a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py b/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py
index f59940085de20657fb3a7ec3c7d0cab61e77bd32..9a2d240934b06afbba0136ffca06238c62413047 100644 (file)
--- a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py
+++ b/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py
@@ -26,9 +26,9 @@ from rollover.common import (
 
 
 @pytest.fixture(scope="module", autouse=True)
-def after_servers_start(ns6, templates):
-    templates.render("ns6/named.conf", {"policy": "insecure"})
-    ns6.reconfigure()  # move from "unsigning" to "insecure"
+def after_servers_start(ns3, templates):
+    templates.render("ns3/named.conf", {"policy": "insecure"})
+    ns3.reconfigure()  # move from "unsigning" to "insecure"
 
 
 @pytest.mark.parametrize(
@@ -38,12 +38,12 @@ def after_servers_start(ns6, templates):
         "going-insecure-dynamic.kasp",
     ],
 )
-def test_going_insecure_reconfig_step1(zone, alg, size, ns6):
+def test_going_insecure_reconfig_step1(zone, alg, size, ns3):
     config = DEFAULT_CONFIG
     policy = "insecure"
     zone = f"step1.{zone}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     # Key goal states should be HIDDEN.
     # The DS may be removed if we are going insecure.
@@ -61,7 +61,7 @@ def test_going_insecure_reconfig_step1(zone, alg, size, ns6):
         "cds-delete": True,
         "check-keytimes": False,
     }
-    isctest.kasp.check_rollover_step(ns6, config, policy, step)
+    isctest.kasp.check_rollover_step(ns3, config, policy, step)
 
 
 @pytest.mark.parametrize(
@@ -71,12 +71,12 @@ def test_going_insecure_reconfig_step1(zone, alg, size, ns6):
         "going-insecure-dynamic.kasp",
     ],
 )
-def test_going_insecure_reconfig_step2(zone, alg, size, ns6):
+def test_going_insecure_reconfig_step2(zone, alg, size, ns3):
     config = DEFAULT_CONFIG
     policy = "insecure"
     zone = f"step2.{zone}"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
     # The DS is long enough removed from the zone to be considered
     # HIDDEN.  This means the DNSKEY and the KSK signatures can be
@@ -96,4 +96,4 @@ def test_going_insecure_reconfig_step2(zone, alg, size, ns6):
         "zone-signed": False,
         "check-keytimes": False,
     }
-    isctest.kasp.check_rollover_step(ns6, config, policy, step)
+    isctest.kasp.check_rollover_step(ns3, config, policy, step)

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

diff --git a/bin/tests/system/rollover-lifetime/ns3/limit-lifetime.db b/bin/tests/system/rollover-lifetime/ns3/limit-lifetime.db
new file mode 120000 (symlink)
index 0000000..ce6d526
--- /dev/null
+++ b/bin/tests/system/rollover-lifetime/ns3/limit-lifetime.db
@@ -0,0 +1 @@
+../../rollover/ns3/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-lifetime/ns3/longer-lifetime.db b/bin/tests/system/rollover-lifetime/ns3/longer-lifetime.db
new file mode 120000 (symlink)
index 0000000..ce6d526
--- /dev/null
+++ b/bin/tests/system/rollover-lifetime/ns3/longer-lifetime.db
@@ -0,0 +1 @@
+../../rollover/ns3/template.db.in
\ No newline at end of file

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

diff --git a/bin/tests/system/rollover-lifetime/ns6/named.conf.j2 b/bin/tests/system/rollover-lifetime/ns3/named.conf.j2
similarity index 91%
rename from bin/tests/system/rollover-lifetime/ns6/named.conf.j2
rename to bin/tests/system/rollover-lifetime/ns3/named.conf.j2
index 75b38db72874ec7b291ff5aabfc52a4839691b5b..7adfbda12d472f603891fa6eef6669e24115b98c 100644 (file)
--- a/bin/tests/system/rollover-lifetime/ns6/named.conf.j2
+++ b/bin/tests/system/rollover-lifetime/ns3/named.conf.j2
@@ -20,25 +20,25 @@
 include "kasp.conf";
 include "named.common.conf";
 
-zone longer-lifetime {
+zone longer-lifetime.kasp {
        type primary;
        file "longer-lifetime.db";
        dnssec-policy @longer@;
 };
 
-zone shorter-lifetime {
+zone shorter-lifetime.kasp {
        type primary;
        file "shorter-lifetime.db";
        dnssec-policy @shorter@;
 };
 
-zone limit-lifetime {
+zone limit-lifetime.kasp {
        type primary;
        file "limit-lifetime.db";
        dnssec-policy @limit@;
 };
 
-zone unlimit-lifetime {
+zone unlimit-lifetime.kasp {
        type primary;
        file "unlimit-lifetime.db";
        dnssec-policy @unlimit@;

diff --git a/bin/tests/system/rollover-lifetime/ns3/shorter-lifetime.db b/bin/tests/system/rollover-lifetime/ns3/shorter-lifetime.db
new file mode 120000 (symlink)
index 0000000..ce6d526
--- /dev/null
+++ b/bin/tests/system/rollover-lifetime/ns3/shorter-lifetime.db
@@ -0,0 +1 @@
+../../rollover/ns3/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-lifetime/ns3/unlimit-lifetime.db b/bin/tests/system/rollover-lifetime/ns3/unlimit-lifetime.db
new file mode 120000 (symlink)
index 0000000..ce6d526
--- /dev/null
+++ b/bin/tests/system/rollover-lifetime/ns3/unlimit-lifetime.db
@@ -0,0 +1 @@
+../../rollover/ns3/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-lifetime/ns6/limit-lifetime.db b/bin/tests/system/rollover-lifetime/ns6/limit-lifetime.db
deleted file mode 120000 (symlink)
index 2159866..0000000
--- a/bin/tests/system/rollover-lifetime/ns6/limit-lifetime.db
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover-dynamic2inline/ns6/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-lifetime/ns6/longer-lifetime.db b/bin/tests/system/rollover-lifetime/ns6/longer-lifetime.db
deleted file mode 120000 (symlink)
index 2159866..0000000
--- a/bin/tests/system/rollover-lifetime/ns6/longer-lifetime.db
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover-dynamic2inline/ns6/template.db.in
\ No newline at end of file

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

diff --git a/bin/tests/system/rollover-lifetime/ns6/shorter-lifetime.db b/bin/tests/system/rollover-lifetime/ns6/shorter-lifetime.db
deleted file mode 120000 (symlink)
index 2159866..0000000
--- a/bin/tests/system/rollover-lifetime/ns6/shorter-lifetime.db
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover-dynamic2inline/ns6/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-lifetime/ns6/unlimit-lifetime.db b/bin/tests/system/rollover-lifetime/ns6/unlimit-lifetime.db
deleted file mode 120000 (symlink)
index 2159866..0000000
--- a/bin/tests/system/rollover-lifetime/ns6/unlimit-lifetime.db
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover-dynamic2inline/ns6/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py b/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py
index 55478d86bc00e22ba96bef0e1f5f1cbc7ff73f19..a7f5ead0fad53ad6b46f0a4a8b9d2ee1c5e71f2a 100644 (file)
--- a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py
+++ b/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py
@@ -34,17 +34,17 @@ from rollover.common import (
         param("unlimit-lifetime", "short-lifetime", "P6M"),
     ],
 )
-def test_lifetime_initial(zone, policy, lifetime, alg, size, ns6):
+def test_lifetime_initial(zone, policy, lifetime, alg, size, ns3):
     config = DEFAULT_CONFIG
 
-    isctest.kasp.wait_keymgr_done(ns6, zone)
+    isctest.kasp.wait_keymgr_done(ns3, f"{zone}.kasp")
 
     step = {
-        "zone": zone,
+        "zone": f"{zone}.kasp",
         "cdss": CDSS,
         "keyprops": [
             f"csk {DURATION[lifetime]} {alg} {size} goal:omnipresent dnskey:rumoured krrsig:rumoured zrrsig:rumoured ds:hidden",
         ],
         "nextev": None,
     }
-    isctest.kasp.check_rollover_step(ns6, config, policy, step)
+    isctest.kasp.check_rollover_step(ns3, config, policy, step)

diff --git a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py b/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py
index 9462f1ad9722e51c6c433702d73450201ab599bf..d28a7e4cd5b924949b82e28e30652dafd102611e 100644 (file)
--- a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py
+++ b/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py
@@ -26,14 +26,14 @@ from rollover.common import (
 
 
 @pytest.fixture(scope="module", autouse=True)
-def after_servers_start(ns6, templates):
-    isctest.kasp.wait_keymgr_done(ns6, "shorter-lifetime")
-    isctest.kasp.wait_keymgr_done(ns6, "longer-lifetime")
-    isctest.kasp.wait_keymgr_done(ns6, "limit-lifetime")
-    isctest.kasp.wait_keymgr_done(ns6, "unlimit-lifetime")
+def after_servers_start(ns3, templates):
+    isctest.kasp.wait_keymgr_done(ns3, "shorter-lifetime.kasp")
+    isctest.kasp.wait_keymgr_done(ns3, "longer-lifetime.kasp")
+    isctest.kasp.wait_keymgr_done(ns3, "limit-lifetime.kasp")
+    isctest.kasp.wait_keymgr_done(ns3, "unlimit-lifetime.kasp")
 
-    templates.render("ns6/named.conf", {"change_lifetime": True})
-    ns6.reconfigure()
+    templates.render("ns3/named.conf", {"change_lifetime": True})
+    ns3.reconfigure()
 
 
 @pytest.mark.parametrize(
@@ -49,17 +49,17 @@ def after_servers_start(ns6, templates):
         param("unlimit-lifetime", "unlimited-lifetime", 0),
     ],
 )
-def test_lifetime_reconfig(zone, policy, lifetime, alg, size, ns6):
+def test_lifetime_reconfig(zone, policy, lifetime, alg, size, ns3):
     config = DEFAULT_CONFIG
 
-    isctest.kasp.wait_keymgr_done(ns6, zone, reconfig=True)
+    isctest.kasp.wait_keymgr_done(ns3, f"{zone}.kasp", reconfig=True)
 
     step = {
-        "zone": zone,
+        "zone": f"{zone}.kasp",
         "cdss": CDSS,
         "keyprops": [
             f"csk {DURATION[lifetime]} {alg} {size} goal:omnipresent dnskey:rumoured krrsig:rumoured zrrsig:rumoured ds:hidden",
         ],
         "nextev": None,
     }
-    isctest.kasp.check_rollover_step(ns6, config, policy, step)
+    isctest.kasp.check_rollover_step(ns3, config, policy, step)

diff --git a/bin/tests/system/rollover-straight2none/ns3/kasp.conf.j2 b/bin/tests/system/rollover-straight2none/ns3/kasp.conf.j2
new file mode 120000 (symlink)
index 0000000..909d990
--- /dev/null
+++ b/bin/tests/system/rollover-straight2none/ns3/kasp.conf.j2
@@ -0,0 +1 @@
+../../rollover-going-insecure/ns3/kasp.conf.j2
\ No newline at end of file

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

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

diff --git a/bin/tests/system/rollover-straight2none/ns3/template.db.in b/bin/tests/system/rollover-straight2none/ns3/template.db.in
new file mode 120000 (symlink)
index 0000000..ce6d526
--- /dev/null
+++ b/bin/tests/system/rollover-straight2none/ns3/template.db.in
@@ -0,0 +1 @@
+../../rollover/ns3/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-straight2none/ns6/kasp.conf.j2 b/bin/tests/system/rollover-straight2none/ns6/kasp.conf.j2
deleted file mode 120000 (symlink)
index 4a8da1d..0000000
--- a/bin/tests/system/rollover-straight2none/ns6/kasp.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover-going-insecure/ns6/kasp.conf.j2
\ No newline at end of file

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

diff --git a/bin/tests/system/rollover-straight2none/ns6/template.db.in b/bin/tests/system/rollover-straight2none/ns6/template.db.in
deleted file mode 120000 (symlink)
index 2159866..0000000
--- a/bin/tests/system/rollover-straight2none/ns6/template.db.in
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover-dynamic2inline/ns6/template.db.in
\ No newline at end of file

diff --git a/bin/tests/system/rollover-straight2none/setup.sh b/bin/tests/system/rollover-straight2none/setup.sh
index 2a42dba557ffaaa8e422a35dcd432bcdfa021461..790b0e22cec93f5ef0df00786e7ce8b3f71e9881 100644 (file)
--- a/bin/tests/system/rollover-straight2none/setup.sh
+++ b/bin/tests/system/rollover-straight2none/setup.sh
@@ -14,7 +14,7 @@
 # shellcheck source=conf.sh
 . ../conf.sh
 
-cd "ns6"
+cd "ns3"
 
 setup() {
   zone="$1"

diff --git a/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_initial.py b/bin/tests/system/rollover-straight2none/tests_rollover_straight2none_initial.py
similarity index 86%
rename from bin/tests/system/rollover-straight2none/tests_rollver_straight2none_initial.py
rename to bin/tests/system/rollover-straight2none/tests_rollover_straight2none_initial.py
index 1d5a108d2aa5ca991447a4df89e593dec659884d..098108a6f5442b100e8543c79c6d400a6bbbbee3 100644 (file)
--- a/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_initial.py
+++ b/bin/tests/system/rollover-straight2none/tests_rollover_straight2none_initial.py
@@ -31,11 +31,11 @@ from rollover.common import (
         "going-straight-to-none-dynamic.kasp",
     ],
 )
-def test_straight2none_initial(zone, ns6, alg, size):
+def test_straight2none_initial(zone, ns3, alg, size):
     config = DEFAULT_CONFIG
     policy = "default"
 
-    isctest.kasp.wait_keymgr_done(ns6, zone)
+    isctest.kasp.wait_keymgr_done(ns3, zone)
 
     step = {
         "zone": zone,
@@ -45,4 +45,4 @@ def test_straight2none_initial(zone, ns6, alg, size):
         ],
         "nextev": None,
     }
-    isctest.kasp.check_rollover_step(ns6, config, policy, step)
+    isctest.kasp.check_rollover_step(ns3, config, policy, step)

diff --git a/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_reconfig.py b/bin/tests/system/rollover-straight2none/tests_rollover_straight2none_reconfig.py
similarity index 77%
rename from bin/tests/system/rollover-straight2none/tests_rollver_straight2none_reconfig.py
rename to bin/tests/system/rollover-straight2none/tests_rollover_straight2none_reconfig.py
index dc1fbf22198649efd0bda0fa120dc85429fa2a37..e5fe16aa3d755a99f069123c039d54dc4119b0f9 100644 (file)
--- a/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_reconfig.py
+++ b/bin/tests/system/rollover-straight2none/tests_rollover_straight2none_reconfig.py
@@ -25,12 +25,12 @@ from rollover.common import (
 
 
 @pytest.fixture(scope="module", autouse=True)
-def after_servers_start(ns6, templates):
-    isctest.kasp.wait_keymgr_done(ns6, "going-straight-to-none.kasp")
-    isctest.kasp.wait_keymgr_done(ns6, "going-straight-to-none-dynamic.kasp")
+def after_servers_start(ns3, templates):
+    isctest.kasp.wait_keymgr_done(ns3, "going-straight-to-none.kasp")
+    isctest.kasp.wait_keymgr_done(ns3, "going-straight-to-none-dynamic.kasp")
 
-    templates.render("ns6/named.conf", {"policy": "none"})
-    ns6.reconfigure()
+    templates.render("ns3/named.conf", {"policy": "none"})
+    ns3.reconfigure()
 
 
 @pytest.mark.parametrize(
@@ -40,7 +40,7 @@ def after_servers_start(ns6, templates):
         "going-straight-to-none-dynamic.kasp",
     ],
 )
-def test_straight2none_reconfig(zone, ns6, alg, size):
+def test_straight2none_reconfig(zone, ns3, alg, size):
     config = DEFAULT_CONFIG
     policy = None
 
@@ -54,4 +54,4 @@ def test_straight2none_reconfig(zone, ns6, alg, size):
         ],
         "nextev": None,
     }
-    isctest.kasp.check_rollover_step(ns6, config, policy, step)
+    isctest.kasp.check_rollover_step(ns3, config, policy, step)