alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/tests/knot: Use more appropriate terminology

Browse source
This commit is contained in:
Martin Weinelt 2023-02-25 02:47:52 +01:00
parent 1fc6f2c412
commit 487b6a38f3
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
nixos/tests/knot.nix
View file

@ -43,7 +43,7 @@ in {
nodes = { nodes = {
master = { lib, ... }: { primary = { lib, ... }: {
imports = [ common ]; imports = [ common ];
# trigger sched_setaffinity syscall # trigger sched_setaffinity syscall
@ -67,14 +67,14 @@ in {
automatic-acl: true automatic-acl: true
remote: remote:
- id: slave - id: secondary
address: 192.168.0.2@53 address: 192.168.0.2@53
key: xfr_key key: xfr_key
template: template:
- id: default - id: default
storage: ${knotZonesEnv} storage: ${knotZonesEnv}
notify: [slave] notify: [secondary]
dnssec-signing: on dnssec-signing: on
# Input-only zone files # Input-only zone files
# https://www.knot-dns.cz/docs/2.8/html/operation.html#example-3 # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-3
@ -100,7 +100,7 @@ in {
''; '';
}; };
slave = { lib, ... }: { secondary = { lib, ... }: {
imports = [ common ]; imports = [ common ];
networking.interfaces.eth1 = { networking.interfaces.eth1 = {
ipv4.addresses = lib.mkForce [ ipv4.addresses = lib.mkForce [
@ -120,13 +120,13 @@ in {
automatic-acl: true automatic-acl: true
remote: remote:
- id: master - id: primary
address: 192.168.0.1@53 address: 192.168.0.1@53
key: xfr_key key: xfr_key
template: template:
- id: default - id: default
master: master master: primary
# zonefileless setup # zonefileless setup
# https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2 # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2
zonefile-sync: -1 zonefile-sync: -1
@ -164,19 +164,19 @@ in {
}; };
testScript = { nodes, ... }: let testScript = { nodes, ... }: let
master4 = (lib.head nodes.master.config.networking.interfaces.eth1.ipv4.addresses).address; primary4 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv4.addresses).address;
master6 = (lib.head nodes.master.config.networking.interfaces.eth1.ipv6.addresses).address; primary6 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv6.addresses).address;
slave4 = (lib.head nodes.slave.config.networking.interfaces.eth1.ipv4.addresses).address; secondary4 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv4.addresses).address;
slave6 = (lib.head nodes.slave.config.networking.interfaces.eth1.ipv6.addresses).address; secondary6 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv6.addresses).address;
in '' in ''
import re import re
start_all() start_all()
client.wait_for_unit("network.target") client.wait_for_unit("network.target")
master.wait_for_unit("knot.service") primary.wait_for_unit("knot.service")
slave.wait_for_unit("knot.service") secondary.wait_for_unit("knot.service")
def test(host, query_type, query, pattern): def test(host, query_type, query, pattern):
@ -185,7 +185,7 @@ in {
assert re.search(pattern, out), f'Did not match "{pattern}"' assert re.search(pattern, out), f'Did not match "{pattern}"'
for host in ("${master4}", "${master6}", "${slave4}", "${slave6}"): for host in ("${primary4}", "${primary6}", "${secondary4}", "${secondary6}"):
with subtest(f"Interrogate {host}"): with subtest(f"Interrogate {host}"):
test(host, "SOA", "example.com", r"start of authority.*noc\.example\.com\.") test(host, "SOA", "example.com", r"start of authority.*noc\.example\.com\.")
test(host, "A", "example.com", r"has no [^ ]+ record") test(host, "A", "example.com", r"has no [^ ]+ record")
@ -201,6 +201,6 @@ in {
test(host, "RRSIG", "www.example.com", r"RR set signature is") test(host, "RRSIG", "www.example.com", r"RR set signature is")
test(host, "DNSKEY", "example.com", r"DNSSEC key is") test(host, "DNSKEY", "example.com", r"DNSSEC key is")
master.log(master.succeed("systemd-analyze security knot.service | grep -v '✓'")) primary.log(primary.succeed("systemd-analyze security knot.service | grep -v '✓'"))
''; '';
}) })