diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-10-14 17:37:42 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2025-10-16 16:33:44 +0200 |
| commit | 9775bb49e4d42c7bf09f4d78b404b5b39b47b11f (patch) | |
| tree | 55caae9784be36945f86f6ab3d8a3bed6fea7847 /smoketest/scripts/cli/test_protocols_mpls.py | |
| parent | 6961f7373fdec559f64a82dcb8c0b87d06f53e78 (diff) | |
| download | vyos-1x-9775bb49e4d42c7bf09f4d78b404b5b39b47b11f.tar.gz vyos-1x-9775bb49e4d42c7bf09f4d78b404b5b39b47b11f.zip | |
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.
Diffstat (limited to 'smoketest/scripts/cli/test_protocols_mpls.py')
| -rwxr-xr-x | smoketest/scripts/cli/test_protocols_mpls.py | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/smoketest/scripts/cli/test_protocols_mpls.py b/smoketest/scripts/cli/test_protocols_mpls.py index c97e542cb..cabaaf0ef 100755 --- a/smoketest/scripts/cli/test_protocols_mpls.py +++ b/smoketest/scripts/cli/test_protocols_mpls.py @@ -106,14 +106,14 @@ class TestProtocolsMPLS(VyOSUnitTestSHIM.TestCase): self.cli_commit() # Validate configuration - frrconfig = self.getFRRconfig('mpls ldp', endsection='^exit') + frrconfig = self.getFRRconfig('mpls ldp', stop_section='^exit') self.assertIn(f'mpls ldp', frrconfig) self.assertIn(f' router-id {router_id}', frrconfig) # Validate AFI IPv4 - afiv4_config = self.getFRRconfig('mpls ldp', endsection='^exit', - substring=' address-family ipv4', - endsubsection='^ exit-address-family') + afiv4_config = self.getFRRconfig('mpls ldp', stop_section='^exit', + start_subsection=' address-family ipv4', + stop_subsection='^ exit-address-family') self.assertIn(f' discovery transport-address {transport_ipv4_addr}', afiv4_config) for interface in interfaces: self.assertIn(f' interface {interface}', afiv4_config) @@ -142,23 +142,23 @@ class TestProtocolsMPLS(VyOSUnitTestSHIM.TestCase): self.cli_commit() # Validate configuration - frrconfig = self.getFRRconfig('mpls ldp', endsection='^exit') + frrconfig = self.getFRRconfig('mpls ldp', stop_section='^exit') self.assertIn(f'mpls ldp', frrconfig) self.assertIn(f' router-id {router_id}', frrconfig) # Validate AFI IPv4 - afiv4_config = self.getFRRconfig('mpls ldp', endsection='^exit', - substring=' address-family ipv4', - endsubsection='^ exit-address-family') + afiv4_config = self.getFRRconfig('mpls ldp', stop_section='^exit', + start_subsection=' address-family ipv4', + stop_subsection='^ exit-address-family') self.assertIn(f' discovery transport-address {transport_ipv4_addr}', afiv4_config) for interface in interfaces: self.assertIn(f' interface {interface}', afiv4_config) self.assertIn(f' disable-establish-hello', afiv4_config) # Validate AFI IPv6 - afiv6_config = self.getFRRconfig('mpls ldp', endsection='^exit', - substring=' address-family ipv6', - endsubsection='^ exit-address-family') + afiv6_config = self.getFRRconfig('mpls ldp', stop_section='^exit', + start_subsection=' address-family ipv6', + stop_subsection='^ exit-address-family') self.assertIn(f' discovery transport-address {transport_ipv6_addr}', afiv6_config) for interface in interfaces: self.assertIn(f' interface {interface}', afiv6_config) @@ -172,13 +172,13 @@ class TestProtocolsMPLS(VyOSUnitTestSHIM.TestCase): self.cli_commit() # Validate AFI IPv4 - afiv4_config = self.getFRRconfig('mpls ldp', endsection='^exit', - substring=' address-family ipv4', - endsubsection='^ exit-address-family') + afiv4_config = self.getFRRconfig('mpls ldp', stop_section='^exit', + start_subsection=' address-family ipv4', + stop_subsection='^ exit-address-family') # Validate AFI IPv6 - afiv6_config = self.getFRRconfig('mpls ldp', endsection='^exit', - substring=' address-family ipv6', - endsubsection='^ exit-address-family') + afiv6_config = self.getFRRconfig('mpls ldp', stop_section='^exit', + start_subsection=' address-family ipv6', + stop_subsection='^ exit-address-family') # Check deleted 'disable-establish-hello' option per interface for interface in interfaces: self.assertIn(f' interface {interface}', afiv4_config) |