summaryrefslogtreecommitdiff
path: root/smoketest
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-10-06 15:05:14 +0200
committerChristian Breunig <christian@breunig.cc>2024-12-16 22:21:36 +0100
commit7538fd4c518271a517b6753dd664fd07cd86bddd (patch)
treefc95ccb70455fb052b1f11c0305fc732842641ea /smoketest
parent2fcd45e225370a508d7bc0c560cc0fe95656c26f (diff)
downloadvyos-1x-7538fd4c518271a517b6753dd664fd07cd86bddd.tar.gz
vyos-1x-7538fd4c518271a517b6753dd664fd07cd86bddd.zip
rpki: T6747: adjust to new FRR cli interface
Diffstat (limited to 'smoketest')
-rwxr-xr-xsmoketest/scripts/cli/test_protocols_rpki.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/smoketest/scripts/cli/test_protocols_rpki.py b/smoketest/scripts/cli/test_protocols_rpki.py
index 29f03a26a..c6a6adf58 100755
--- a/smoketest/scripts/cli/test_protocols_rpki.py
+++ b/smoketest/scripts/cli/test_protocols_rpki.py
@@ -117,6 +117,9 @@ class TestProtocolsRPKI(VyOSUnitTestSHIM.TestCase):
self.cli_delete(base_path)
self.cli_commit()
+ frrconfig = self.getFRRconfig('rpki')
+ self.assertNotIn(f'rpki', frrconfig)
+
# check process health and continuity
self.assertEqual(self.daemon_pid, process_named_running(PROCESS_NAME))
@@ -159,7 +162,7 @@ class TestProtocolsRPKI(VyOSUnitTestSHIM.TestCase):
for peer, peer_config in cache.items():
port = peer_config['port']
preference = peer_config['preference']
- self.assertIn(f'rpki cache {peer} {port} preference {preference}', frrconfig)
+ self.assertIn(f'rpki cache tcp {peer} {port} preference {preference}', frrconfig)
def test_rpki_ssh(self):
polling = '7200'
@@ -195,7 +198,7 @@ class TestProtocolsRPKI(VyOSUnitTestSHIM.TestCase):
port = cache_config['port']
preference = cache_config['preference']
username = cache_config['username']
- self.assertIn(f'rpki cache {cache_name} {port} {username} /run/frr/id_rpki_{cache_name} /run/frr/id_rpki_{cache_name}.pub preference {preference}', frrconfig)
+ self.assertIn(f'rpki cache ssh {cache_name} {port} {username} /run/frr/id_rpki_{cache_name} /run/frr/id_rpki_{cache_name}.pub preference {preference}', frrconfig)
# Verify content of SSH keys
tmp = read_file(f'/run/frr/id_rpki_{cache_name}')
@@ -213,7 +216,7 @@ class TestProtocolsRPKI(VyOSUnitTestSHIM.TestCase):
port = cache_config['port']
preference = cache_config['preference']
username = cache_config['username']
- self.assertIn(f'rpki cache {cache_name} {port} {username} /run/frr/id_rpki_{cache_name} /run/frr/id_rpki_{cache_name}.pub preference {preference}', frrconfig)
+ self.assertIn(f'rpki cache ssh {cache_name} {port} {username} /run/frr/id_rpki_{cache_name} /run/frr/id_rpki_{cache_name}.pub preference {preference}', frrconfig)
# Verify content of SSH keys
tmp = read_file(f'/run/frr/id_rpki_{cache_name}')