diff options
author | Christian Poessinger <christian@poessinger.com> | 2022-10-14 11:29:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-14 11:29:27 +0200 |
commit | 427ea592ae8d92d29aca245683832b5bd75b643d (patch) | |
tree | ef4232e3e88c642bd469eb12d2747007451d2095 /smoketest/scripts | |
parent | 783f5e24b1c5f15f1d7e91f892051312a2a5c6c3 (diff) | |
parent | e3d66e7eb61c4fd5d29b64370a993d583f597639 (diff) | |
download | vyos-1x-427ea592ae8d92d29aca245683832b5bd75b643d.tar.gz vyos-1x-427ea592ae8d92d29aca245683832b5bd75b643d.zip |
Merge pull request #1595 from Cheeze-It/current
isis, ospf: T4739: ISIS and OSPF segment routing being refactored
Diffstat (limited to 'smoketest/scripts')
-rwxr-xr-x | smoketest/scripts/cli/test_protocols_isis.py | 8 | ||||
-rwxr-xr-x | smoketest/scripts/cli/test_protocols_ospf.py | 13 |
2 files changed, 9 insertions, 12 deletions
diff --git a/smoketest/scripts/cli/test_protocols_isis.py b/smoketest/scripts/cli/test_protocols_isis.py index c26028253..d11d80a1f 100755 --- a/smoketest/scripts/cli/test_protocols_isis.py +++ b/smoketest/scripts/cli/test_protocols_isis.py @@ -263,10 +263,10 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase): self.assertIn(f' isis bfd profile {bfd_profile}', tmp) def test_isis_07_segment_routing_configuration(self): - global_block_low = "100" - global_block_high = "199" - local_block_low = "200" - local_block_high = "299" + global_block_low = "300" + global_block_high = "399" + local_block_low = "400" + local_block_high = "499" interface = 'lo' maximum_stack_size = '5' prefix_one = '192.168.0.1/32' diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py index 93bb761c1..51c947537 100755 --- a/smoketest/scripts/cli/test_protocols_ospf.py +++ b/smoketest/scripts/cli/test_protocols_ospf.py @@ -382,10 +382,10 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase): def test_ospf_14_segment_routing_configuration(self): - global_block_low = "100" - global_block_high = "199" - local_block_low = "200" - local_block_high = "299" + global_block_low = "300" + global_block_high = "399" + local_block_low = "400" + local_block_high = "499" interface = 'lo' maximum_stack_size = '5' prefix_one = '192.168.0.1/32' @@ -408,16 +408,13 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase): self.cli_commit() # Verify all changes - frrconfig = self.getFRRconfig('router ospf') + self.assertIn(f' segment-routing on', frrconfig) self.assertIn(f' segment-routing global-block {global_block_low} {global_block_high} local-block {local_block_low} {local_block_high}', frrconfig) self.assertIn(f' segment-routing node-msd {maximum_stack_size}', frrconfig) self.assertIn(f' segment-routing prefix {prefix_one} index {prefix_one_value} explicit-null', frrconfig) self.assertIn(f' segment-routing prefix {prefix_two} index {prefix_two_value} no-php-flag', frrconfig) - self.skipTest('https://github.com/FRRouting/frr/issues/12007') - self.assertIn(f' segment-routing on', frrconfig) - if __name__ == '__main__': unittest.main(verbosity=2) |