From 0d35a866ba12e66e504e1f575a04429c5d8cb9be Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Fri, 13 Jan 2023 22:07:34 +0100 Subject: ntp: T3008: migrate from ntpd to chrony * Move CLI from "system ntp" -> "service ntp" * Drop NTP server option preempt as not supported by chrony --- smoketest/scripts/cli/test_service_ntp.py | 141 ++++++++++++++++++++++++++++++ smoketest/scripts/cli/test_system_ntp.py | 129 --------------------------- 2 files changed, 141 insertions(+), 129 deletions(-) create mode 100755 smoketest/scripts/cli/test_service_ntp.py delete mode 100755 smoketest/scripts/cli/test_system_ntp.py (limited to 'smoketest') diff --git a/smoketest/scripts/cli/test_service_ntp.py b/smoketest/scripts/cli/test_service_ntp.py new file mode 100755 index 000000000..d4793adb6 --- /dev/null +++ b/smoketest/scripts/cli/test_service_ntp.py @@ -0,0 +1,141 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2019-2023 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import unittest + +from base_vyostest_shim import VyOSUnitTestSHIM + +from vyos.configsession import ConfigSessionError +from vyos.util import cmd +from vyos.util import process_named_running + +PROCESS_NAME = 'chronyd' +NTP_CONF = '/run/chrony/chrony.conf' +base_path = ['service', 'ntp'] + +class TestSystemNTP(VyOSUnitTestSHIM.TestCase): + @classmethod + def setUpClass(cls): + super(TestSystemNTP, cls).setUpClass() + + # ensure we can also run this test on a live system - so lets clean + # out the current configuration :) + cls.cli_delete(cls, base_path) + + def tearDown(self): + self.assertTrue(process_named_running(PROCESS_NAME)) + + self.cli_delete(base_path) + self.cli_commit() + + self.assertFalse(process_named_running(PROCESS_NAME)) + + def test_01_ntp_options(self): + # Test basic NTP support with multiple servers and their options + servers = ['192.0.2.1', '192.0.2.2'] + options = ['noselect', 'prefer'] + pools = ['pool.vyos.io'] + + for server in servers: + for option in options: + self.cli_set(base_path + ['server', server, option]) + + # Test NTP pool + for pool in pools: + self.cli_set(base_path + ['server', pool, 'pool']) + + # commit changes + self.cli_commit() + + # Check generated configuration + # this file must be read with higher permissions + config = cmd(f'sudo cat {NTP_CONF}') + self.assertIn('driftfile /run/chrony/drift', config) + self.assertIn('dumpdir /run/chrony', config) + self.assertIn('clientloglimit 1048576', config) + self.assertIn('rtcsync', config) + self.assertIn('makestep 1.0 3', config) + self.assertIn('leapsectz right/UTC', config) + + for server in servers: + self.assertIn(f'server {server} iburst ' + ' '.join(options), config) + + for pool in pools: + self.assertIn(f'pool {pool} iburst', config) + + def test_02_ntp_clients(self): + # Test the allowed-networks statement + listen_address = ['127.0.0.1', '::1'] + for listen in listen_address: + self.cli_set(base_path + ['listen-address', listen]) + + networks = ['192.0.2.0/24', '2001:db8:1000::/64', '100.64.0.0', '2001:db8::ffff'] + 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 + # this file must be read with higher permissions + config = cmd(f'sudo cat {NTP_CONF}') + for network in networks: + self.assertIn(f'allow {network}', config) + + # Check listen address + for listen in listen_address: + self.assertIn(f'bindaddress {listen}', config) + + def test_03_ntp_interface(self): + interfaces = ['eth0', 'eth1'] + for interface in interfaces: + self.cli_set(base_path + ['interface', interface]) + + servers = ['time1.vyos.net', 'time2.vyos.net'] + for server in servers: + self.cli_set(base_path + ['server', server]) + + self.cli_commit() + + # Check generated client address configuration + # this file must be read with higher permissions + config = cmd(f'sudo cat {NTP_CONF}') + for interface in interfaces: + self.assertIn(f'binddevice {interface}', config) + + def test_04_ntp_vrf(self): + vrf_name = 'vyos-mgmt' + + self.cli_set(['vrf', 'name', vrf_name, 'table', '12345']) + self.cli_set(base_path + ['vrf', vrf_name]) + + servers = ['time1.vyos.net', 'time2.vyos.net'] + for server in servers: + self.cli_set(base_path + ['server', server]) + + self.cli_commit() + + self.cli_delete(['vrf', 'name', vrf_name]) + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/smoketest/scripts/cli/test_system_ntp.py b/smoketest/scripts/cli/test_system_ntp.py deleted file mode 100755 index a0806acf0..000000000 --- a/smoketest/scripts/cli/test_system_ntp.py +++ /dev/null @@ -1,129 +0,0 @@ -#!/usr/bin/env python3 -# -# Copyright (C) 2019-2022 VyOS maintainers and contributors -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 or later as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -import unittest - -from base_vyostest_shim import VyOSUnitTestSHIM - -from vyos.configsession import ConfigSessionError -from vyos.template import address_from_cidr -from vyos.template import netmask_from_cidr -from vyos.util import read_file -from vyos.util import process_named_running - -PROCESS_NAME = 'ntpd' -NTP_CONF = '/run/ntpd/ntpd.conf' -base_path = ['system', 'ntp'] - -class TestSystemNTP(VyOSUnitTestSHIM.TestCase): - @classmethod - def setUpClass(cls): - super(TestSystemNTP, cls).setUpClass() - - # ensure we can also run this test on a live system - so lets clean - # out the current configuration :) - cls.cli_delete(cls, base_path) - - def tearDown(self): - self.cli_delete(base_path) - self.cli_commit() - - self.assertFalse(process_named_running(PROCESS_NAME)) - - def test_01_ntp_options(self): - # Test basic NTP support with multiple servers and their options - servers = ['192.0.2.1', '192.0.2.2'] - options = ['noselect', 'preempt', 'prefer'] - pools = ['pool.vyos.io'] - - for server in servers: - for option in options: - self.cli_set(base_path + ['server', server, option]) - - # Test NTP pool - for pool in pools: - self.cli_set(base_path + ['server', pool, 'pool']) - - # commit changes - self.cli_commit() - - # Check generated configuration - config = read_file(NTP_CONF) - self.assertIn('driftfile /var/lib/ntp/ntp.drift', config) - self.assertIn('restrict default noquery nopeer notrap nomodify', config) - self.assertIn('restrict source nomodify notrap noquery', config) - self.assertIn('restrict 127.0.0.1', config) - self.assertIn('restrict -6 ::1', config) - - for server in servers: - self.assertIn(f'server {server} iburst ' + ' '.join(options), config) - - for pool in pools: - self.assertIn(f'pool {pool} iburst', config) - - def test_02_ntp_clients(self): - # Test the allowed-networks statement - listen_address = ['127.0.0.1', '::1'] - for listen in listen_address: - self.cli_set(base_path + ['listen-address', listen]) - - networks = ['192.0.2.0/24', '2001:db8:1000::/64'] - for network in networks: - self.cli_set(base_path + ['allow-clients', '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 - config = read_file(NTP_CONF) - self.assertIn('restrict default ignore', config) - - for network in networks: - network_address = address_from_cidr(network) - network_netmask = netmask_from_cidr(network) - self.assertIn(f'restrict {network_address} mask {network_netmask} nomodify notrap nopeer', config) - - # Check listen address - self.assertIn('interface ignore wildcard', config) - for listen in listen_address: - self.assertIn(f'interface listen {listen}', config) - - def test_03_ntp_interface(self): - interfaces = ['eth0', 'eth1'] - for interface in interfaces: - self.cli_set(base_path + ['interface', interface]) - - servers = ['time1.vyos.net', 'time2.vyos.net'] - for server in servers: - self.cli_set(base_path + ['server', server]) - - self.cli_commit() - - # Check generated client address configuration - config = read_file(NTP_CONF) - self.assertIn('interface ignore wildcard', config) - for interface in interfaces: - self.assertIn(f'interface listen {interface}', config) - -if __name__ == '__main__': - unittest.main(verbosity=2) -- cgit v1.2.3