Commit b8a858f16b for bind
commit b8a858f16b7a9c8ce901bf58518c31f03f57ba72
Author: Colin Vidal <colin@isc.org>
Date: Thu Oct 15 13:49:06 2026 +0200
Add ADT flag to isctest.zone.Zone.configure()
Calling `Zone.configure()` from the `isctest` framework can
now set the ADT flag on generated DNSKEY keys, by specifying
`zone.configure(adt=True)`
diff --git a/bin/tests/system/isctest/zone.py b/bin/tests/system/isctest/zone.py
index 4060279767..c045b463a4 100644
--- a/bin/tests/system/isctest/zone.py
+++ b/bin/tests/system/isctest/zone.py
@@ -459,14 +459,15 @@ class Zone:
"""
return self.directory / self.filepath_signed
- def add_keys(self, ksk: bool = True, zsk: bool = True) -> None:
+ def add_keys(self, ksk: bool = True, zsk: bool = True, adt: bool = False) -> None:
"""
Generate KSK and/or ZSK via dnssec-keygen and append to self.keys.
"""
+ adtopt = "-f ADT" if adt else ""
if ksk:
- self.keys.append(FileZoneKey.generate(self, "-f KSK"))
+ self.keys.append(FileZoneKey.generate(self, f"-f KSK {adtopt}"))
if zsk:
- self.keys.append(FileZoneKey.generate(self))
+ self.keys.append(FileZoneKey.generate(self, adtopt))
def copy_dssets(self) -> None:
"""
@@ -537,6 +538,7 @@ class Zone:
template: str | None = None,
sign_params: str = "",
csk: bool = False,
+ adt: bool = False,
) -> None:
"""
Perform full zone setup: copy DS sets, generate keys, render, sign.
@@ -557,7 +559,7 @@ class Zone:
self._configured = True
self.copy_dssets()
if self.signed:
- self.add_keys(ksk=True, zsk=not csk)
+ self.add_keys(ksk=True, zsk=not csk, adt=adt)
self.render(template)
if self.signed:
if csk: