diff options
| author | anderbak <bjanderson7583@gmail.com> | 2026-05-04 19:20:30 -0400 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-05-21 17:32:53 +0200 |
| commit | fb26030466d017b1c136da6eb631f2c85fb229aa (patch) | |
| tree | 6be3582bd597a039b188189ce3b6a72e1a6a4cfc | |
| parent | 036c1dc949815fddd71c03b09f579623b5b76bff (diff) | |
| download | vyos-1x-fb26030466d017b1c136da6eb631f2c85fb229aa.tar.gz vyos-1x-fb26030466d017b1c136da6eb631f2c85fb229aa.zip | |
ntp: T8601: add local stratum option
| -rw-r--r-- | data/templates/chrony/chrony.conf.j2 | 5 | ||||
| -rw-r--r-- | interface-definitions/service_ntp.xml.in | 12 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_service_ntp.py | 20 | ||||
| -rwxr-xr-x | src/conf_mode/service_ntp.py | 3 |
4 files changed, 29 insertions, 11 deletions
diff --git a/data/templates/chrony/chrony.conf.j2 b/data/templates/chrony/chrony.conf.j2 index cc80e4d64..23b452f01 100644 --- a/data/templates/chrony/chrony.conf.j2 +++ b/data/templates/chrony/chrony.conf.j2 @@ -46,6 +46,11 @@ user {{ user }} {% endfor %} {% endif %} +{% if local_stratum is vyos_defined %} +# Enable local reference mode +local stratum {{ local_stratum }} +{% endif %} + # Allowed clients configuration {% if allow_client.address is vyos_defined %} {% for address in allow_client.address %} diff --git a/interface-definitions/service_ntp.xml.in b/interface-definitions/service_ntp.xml.in index c31b572bd..ebce1bbf4 100644 --- a/interface-definitions/service_ntp.xml.in +++ b/interface-definitions/service_ntp.xml.in @@ -109,6 +109,18 @@ </properties> <defaultValue>timezone</defaultValue> </leafNode> + <leafNode name="local-stratum"> + <properties> + <help>Local reference stratum</help> + <valueHelp> + <format>u32:1-15</format> + <description>Local reference stratum</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-15"/> + </constraint> + </properties> + </leafNode> <tagNode name="server"> <properties> <help>Network Time Protocol (NTP) server</help> diff --git a/smoketest/scripts/cli/test_service_ntp.py b/smoketest/scripts/cli/test_service_ntp.py index 6488182f3..0bd109d2d 100755 --- a/smoketest/scripts/cli/test_service_ntp.py +++ b/smoketest/scripts/cli/test_service_ntp.py @@ -79,6 +79,18 @@ class TestSystemNTP(VyOSUnitTestSHIM.TestCase): for pool in pools: self.assertIn(f'pool {pool} iburst', config) + def test_local_stratum_without_upstream_server(self): + stratum = '10' + network = '192.0.2.0/24' + + self.cli_set(base_path + ['local-stratum', stratum]) + self.cli_set(base_path + ['allow-client', 'address', network]) + self.cli_commit() + + config = cmd(f'sudo cat {NTP_CONF}') + self.assertIn(f'local stratum {stratum}', config) + self.assertIn(f'allow {network}', config) + def test_clients(self): # Test the allowed-networks statement listen_address = ['127.0.0.1', '::1'] @@ -89,14 +101,6 @@ class TestSystemNTP(VyOSUnitTestSHIM.TestCase): for network in networks: self.cli_set(base_path + ['allow-client', 'address', network]) - # Verify "NTP server not configured" verify() statement - with self.assertRaises(ConfigSessionError): - self.cli_commit() - - servers = ['192.0.2.1', '192.0.2.2'] - for server in servers: - self.cli_set(base_path + ['server', server]) - self.cli_commit() # Check generated client address configuration diff --git a/src/conf_mode/service_ntp.py b/src/conf_mode/service_ntp.py index 38e0df079..e734eeb76 100755 --- a/src/conf_mode/service_ntp.py +++ b/src/conf_mode/service_ntp.py @@ -66,9 +66,6 @@ def verify(ntp): if not ntp: return None - if 'server' not in ntp: - raise ConfigError('NTP server not configured') - verify_vrf(ntp) if 'interface' in ntp: |