diff options
author | Christian Breunig <christian@breunig.cc> | 2024-01-21 21:15:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-21 21:15:40 +0100 |
commit | 56dabbfddc6f7d15e27b5293bcf1ed2deb031c38 (patch) | |
tree | 5f0c6d0ead545e683489fbb3490dff044e857406 /smoketest/scripts | |
parent | c9bceff2191986af504b114d2d8cfc3547f72ed1 (diff) | |
parent | 22c8bea36da0a546abcc528dc12a97cd6a0c3b10 (diff) | |
download | vyos-1x-56dabbfddc6f7d15e27b5293bcf1ed2deb031c38.tar.gz vyos-1x-56dabbfddc6f7d15e27b5293bcf1ed2deb031c38.zip |
Merge pull request #2854 from indrajitr/simplify-pdns-recursor
dns: T5959: Streamline dns forwarding service
Diffstat (limited to 'smoketest/scripts')
-rwxr-xr-x | smoketest/scripts/cli/test_service_dns_forwarding.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/smoketest/scripts/cli/test_service_dns_forwarding.py b/smoketest/scripts/cli/test_service_dns_forwarding.py index 85a5f1448..652c4fa7b 100755 --- a/smoketest/scripts/cli/test_service_dns_forwarding.py +++ b/smoketest/scripts/cli/test_service_dns_forwarding.py @@ -24,9 +24,10 @@ from vyos.template import bracketize_ipv6 from vyos.utils.file import read_file from vyos.utils.process import process_named_running -CONFIG_FILE = '/run/powerdns/recursor.conf' -FORWARD_FILE = '/run/powerdns/recursor.forward-zones.conf' -HOSTSD_FILE = '/run/powerdns/recursor.vyos-hostsd.conf.lua' +PDNS_REC_RUN_DIR = '/run/pdns-recursor' +CONFIG_FILE = f'{PDNS_REC_RUN_DIR}/recursor.conf' +FORWARD_FILE = f'{PDNS_REC_RUN_DIR}/recursor.forward-zones.conf' +HOSTSD_FILE = f'{PDNS_REC_RUN_DIR}/recursor.vyos-hostsd.conf.lua' PROCESS_NAME= 'pdns_recursor' base_path = ['service', 'dns', 'forwarding'] @@ -279,7 +280,7 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase): def test_listening_port(self): # We can listen on a different port compared to '53' but only one at a time - for port in ['1053', '5353']: + for port in ['10053', '10054']: self.cli_set(base_path + ['port', port]) for network in allow_from: self.cli_set(base_path + ['allow-from', network]) |