diff options
| author | Haim Gelfenbeyn <haim@g8n.me> | 2024-05-30 12:13:42 -0400 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-05-31 09:40:06 +0000 |
| commit | a4f632d97bbb2e633bb2461688cbf3bcbb0d9e17 (patch) | |
| tree | 875182c134f6b525db33a29a506face0ca44b707 | |
| parent | f6be514d5500ad3242b25aef8c4ec5ff7257379f (diff) | |
| download | vyos-1x-a4f632d97bbb2e633bb2461688cbf3bcbb0d9e17.tar.gz vyos-1x-a4f632d97bbb2e633bb2461688cbf3bcbb0d9e17.zip | |
T6422: Smoke test for NS record configration in authoritative DNS, typo & style fixes
(cherry picked from commit f2d0701f50061374b5a4f55d33201629b3293248)
| -rwxr-xr-x | smoketest/scripts/cli/test_service_dns_forwarding.py | 10 | ||||
| -rwxr-xr-x | src/conf_mode/service_dns_forwarding.py | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/smoketest/scripts/cli/test_service_dns_forwarding.py b/smoketest/scripts/cli/test_service_dns_forwarding.py index 079c584ba..4db1d7495 100755 --- a/smoketest/scripts/cli/test_service_dns_forwarding.py +++ b/smoketest/scripts/cli/test_service_dns_forwarding.py @@ -291,5 +291,15 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase): tmp = get_config_value('edns-subnet-allow-list') self.assertEqual(tmp, ','.join(options)) + def test_multiple_ns_records(self): + test_zone = 'example.com' + self.cli_set(base_path + ['authoritative-domain', test_zone, 'records', 'ns', 'test', 'target', f'ns1.{test_zone}']) + self.cli_set(base_path + ['authoritative-domain', test_zone, 'records', 'ns', 'test', 'target', f'ns2.{test_zone}']) + self.cli_commit() + zone_config = read_file(f'{PDNS_REC_RUN_DIR}/zone.{test_zone}.conf') + self.assertRegex(zone_config, fr'test\s+\d+\s+NS\s+ns1\.{test_zone}\.') + self.assertRegex(zone_config, fr'test\s+\d+\s+NS\s+ns2\.{test_zone}\.') + + if __name__ == '__main__': unittest.main(verbosity=2) diff --git a/src/conf_mode/service_dns_forwarding.py b/src/conf_mode/service_dns_forwarding.py index e8318a83e..70686534f 100755 --- a/src/conf_mode/service_dns_forwarding.py +++ b/src/conf_mode/service_dns_forwarding.py @@ -115,7 +115,7 @@ def get_config(config=None): }) elif rtype == 'ns': if not 'target' in rdata: - dns['authoritative_zone_errors'].append(f'{subnode}.{node}: at leaast one target is required') + dns['authoritative_zone_errors'].append(f'{subnode}.{node}: at least one target is required') continue for target in rdata['target']: @@ -123,7 +123,7 @@ def get_config(config=None): 'name': subnode, 'type': rtype.upper(), 'ttl': rdata['ttl'], - 'value': '{}.'.format(target) + 'value': f'{target}.' }) elif rtype == 'mx': |