diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-02-09 08:14:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-09 08:14:21 +0100 |
| commit | 267579006a98fbdc5802b428d24a917421a56cb2 (patch) | |
| tree | c12e76e2c053395bf9d64d6322dce71dd6670b8a /smoketest | |
| parent | a2f58cd50cf911e1ac9b4fb0646ab49522bee985 (diff) | |
| parent | 402aba6cdb4e5a2e19edfd1a8c4bda6624bfb6e4 (diff) | |
| download | vyos-1x-267579006a98fbdc5802b428d24a917421a56cb2.tar.gz vyos-1x-267579006a98fbdc5802b428d24a917421a56cb2.zip | |
Merge pull request #2972 from vyos/mergify/bp/sagitta/pr-2955
rpki: T6023: add support for CLI knobs expire-interval and retry-interval (backport #2955)
Diffstat (limited to 'smoketest')
| -rwxr-xr-x | smoketest/scripts/cli/test_protocols_rpki.py | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/smoketest/scripts/cli/test_protocols_rpki.py b/smoketest/scripts/cli/test_protocols_rpki.py index b43c626c4..c52c0dd76 100755 --- a/smoketest/scripts/cli/test_protocols_rpki.py +++ b/smoketest/scripts/cli/test_protocols_rpki.py @@ -52,27 +52,28 @@ class TestProtocolsRPKI(VyOSUnitTestSHIM.TestCase): self.assertEqual(self.daemon_pid, process_named_running(PROCESS_NAME)) def test_rpki(self): - polling = '7200' + expire_interval = '3600' + polling_period = '600' + retry_interval = '300' cache = { '192.0.2.1' : { 'port' : '8080', - 'preference' : '1' - }, - '192.0.2.2' : { - 'port' : '9090', - 'preference' : '2' + 'preference' : '10' }, '2001:db8::1' : { 'port' : '1234', - 'preference' : '3' + 'preference' : '30' }, - '2001:db8::2' : { + 'rpki.vyos.net' : { 'port' : '5678', - 'preference' : '4' + 'preference' : '40' }, } - self.cli_set(base_path + ['polling-period', polling]) + self.cli_set(base_path + ['expire-interval', expire_interval]) + self.cli_set(base_path + ['polling-period', polling_period]) + self.cli_set(base_path + ['retry-interval', retry_interval]) + for peer, peer_config in cache.items(): self.cli_set(base_path + ['cache', peer, 'port', peer_config['port']]) self.cli_set(base_path + ['cache', peer, 'preference', peer_config['preference']]) @@ -82,7 +83,9 @@ class TestProtocolsRPKI(VyOSUnitTestSHIM.TestCase): # Verify FRR configuration frrconfig = self.getFRRconfig('rpki') - self.assertIn(f'rpki polling_period {polling}', frrconfig) + self.assertIn(f'rpki expire_interval {expire_interval}', frrconfig) + self.assertIn(f'rpki polling_period {polling_period}', frrconfig) + self.assertIn(f'rpki retry_interval {retry_interval}', frrconfig) for peer, peer_config in cache.items(): port = peer_config['port'] |