summaryrefslogtreecommitdiff
path: root/smoketest/scripts/cli/test_system_ip.py
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-10-06 15:17:17 +0200
committerChristian Breunig <christian@breunig.cc>2024-12-16 22:21:36 +0100
commit81923562a8a164f7ff9761e976c20420a585907a (patch)
tree8fe525e8ab4bb0d07f9eb52b52816e50bcb956cf /smoketest/scripts/cli/test_system_ip.py
parent7538fd4c518271a517b6753dd664fd07cd86bddd (diff)
downloadvyos-1x-81923562a8a164f7ff9761e976c20420a585907a.tar.gz
vyos-1x-81923562a8a164f7ff9761e976c20420a585907a.zip
frr: T6747: make daemon definitions re-usable for both conf-mode and smoketests
Diffstat (limited to 'smoketest/scripts/cli/test_system_ip.py')
-rwxr-xr-xsmoketest/scripts/cli/test_system_ip.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/smoketest/scripts/cli/test_system_ip.py b/smoketest/scripts/cli/test_system_ip.py
index 5b0090237..4ab5e8181 100755
--- a/smoketest/scripts/cli/test_system_ip.py
+++ b/smoketest/scripts/cli/test_system_ip.py
@@ -19,6 +19,7 @@ from base_vyostest_shim import VyOSUnitTestSHIM
from vyos.configsession import ConfigSessionError
from vyos.utils.file import read_file
+from vyos.frr import mgmt_daemon
base_path = ['system', 'ip']
@@ -83,7 +84,7 @@ class TestSystemIP(VyOSUnitTestSHIM.TestCase):
self.cli_commit()
# Verify route-map properly applied to FRR
- frrconfig = self.getFRRconfig('ip protocol', end='', daemon='zebra')
+ frrconfig = self.getFRRconfig('ip protocol', end='', daemon=mgmt_daemon)
for protocol in protocols:
self.assertIn(f'ip protocol {protocol} route-map route-map-{protocol}', frrconfig)
@@ -94,7 +95,7 @@ class TestSystemIP(VyOSUnitTestSHIM.TestCase):
self.cli_commit()
# Verify route-map properly applied to FRR
- frrconfig = self.getFRRconfig('ip protocol', end='', daemon='zebra')
+ frrconfig = self.getFRRconfig('ip protocol', end='', daemon=mgmt_daemon)
self.assertNotIn(f'ip protocol', frrconfig)
def test_system_ip_protocol_non_existing_route_map(self):
@@ -113,13 +114,13 @@ class TestSystemIP(VyOSUnitTestSHIM.TestCase):
self.cli_set(base_path + ['nht', 'no-resolve-via-default'])
self.cli_commit()
# Verify CLI config applied to FRR
- frrconfig = self.getFRRconfig('', end='', daemon='zebra')
+ frrconfig = self.getFRRconfig('', end='', daemon=mgmt_daemon)
self.assertIn(f'no ip nht resolve-via-default', frrconfig)
self.cli_delete(base_path + ['nht', 'no-resolve-via-default'])
self.cli_commit()
# Verify CLI config removed to FRR
- frrconfig = self.getFRRconfig('', end='', daemon='zebra')
+ frrconfig = self.getFRRconfig('', end='', daemon=mgmt_daemon)
self.assertNotIn(f'no ip nht resolve-via-default', frrconfig)
if __name__ == '__main__':