From 9775bb49e4d42c7bf09f4d78b404b5b39b47b11f Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Tue, 14 Oct 2025 17:37:42 +0200 Subject: frr: T7664: drop BASH/SED implementation in smoketest getFRRconfig() Rathern then re-inventing the wheel by outself we import the frr-reload.py script and their read-in function of the current vtysh configuration. --- smoketest/scripts/cli/test_protocols_pim.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'smoketest/scripts/cli/test_protocols_pim.py') diff --git a/smoketest/scripts/cli/test_protocols_pim.py b/smoketest/scripts/cli/test_protocols_pim.py index 2560254bc..780d4af23 100755 --- a/smoketest/scripts/cli/test_protocols_pim.py +++ b/smoketest/scripts/cli/test_protocols_pim.py @@ -65,11 +65,11 @@ class TestProtocolsPIM(VyOSUnitTestSHIM.TestCase): self.cli_commit() # Verify FRR pimd configuration - frrconfig = self.getFRRconfig('router pim', endsection='^exit') + frrconfig = self.getFRRconfig('router pim', stop_section='^exit') self.assertIn(f' rp {rp} {group}', frrconfig) for interface in interfaces: - frrconfig = self.getFRRconfig(f'interface {interface}', endsection='^exit') + frrconfig = self.getFRRconfig(f'interface {interface}', stop_section='^exit') self.assertIn(f'interface {interface}', frrconfig) self.assertIn(f' ip pim', frrconfig) self.assertIn(f' ip pim bfd', frrconfig) @@ -116,7 +116,7 @@ class TestProtocolsPIM(VyOSUnitTestSHIM.TestCase): self.cli_commit() # Verify FRR pimd configuration - frrconfig = self.getFRRconfig('router pim', endsection='^exit') + frrconfig = self.getFRRconfig('router pim', stop_section='^exit') self.assertIn(f' no send-v6-secondary', frrconfig) self.assertIn(f' rp {rp} {group}', frrconfig) self.assertIn(f' register-suppress-time {register_suppress_time}', frrconfig) @@ -182,7 +182,7 @@ class TestProtocolsPIM(VyOSUnitTestSHIM.TestCase): self.assertIn(f'ip igmp watermark-warn {watermark_warning}', frrconfig) for interface in interfaces: - frrconfig = self.getFRRconfig(f'interface {interface}', endsection='^exit') + frrconfig = self.getFRRconfig(f'interface {interface}', stop_section='^exit') self.assertIn(f'interface {interface}', frrconfig) self.assertIn(f' ip igmp', frrconfig) self.assertIn(f' ip igmp version {version}', frrconfig) -- cgit v1.2.3