diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-10-21 09:16:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-21 09:16:42 +0200 |
| commit | c53a8b2a837ef39cb16e69f94b9954053355382e (patch) | |
| tree | f91b98b0ae42ccea132f6b5ae435303149087f47 | |
| parent | 7d332b54762182154d640e06e342482efc3c7150 (diff) | |
| parent | da17d2b9a8e347ab9c9cee9100a580aeead79e99 (diff) | |
| download | vyos-1x-c53a8b2a837ef39cb16e69f94b9954053355382e.tar.gz vyos-1x-c53a8b2a837ef39cb16e69f94b9954053355382e.zip | |
Merge pull request #2389 from vyos/mergify/bp/sagitta/pr-2385
T5667: BGP label-unicast enable ecmp (backport #2385)
| -rw-r--r-- | interface-definitions/include/bgp/protocol-common-config.xml.i | 1 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_protocols_bgp.py | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i index 504385b53..3d9333639 100644 --- a/interface-definitions/include/bgp/protocol-common-config.xml.i +++ b/interface-definitions/include/bgp/protocol-common-config.xml.i @@ -343,6 +343,7 @@ #include <include/route-map.xml.i> </children> </tagNode> + #include <include/bgp/afi-maximum-paths.xml.i> </children> </node> <node name="ipv4-flowspec"> diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py index 967958cab..5e3402fa8 100755 --- a/smoketest/scripts/cli/test_protocols_bgp.py +++ b/smoketest/scripts/cli/test_protocols_bgp.py @@ -340,6 +340,8 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase): # AFI maximum path support self.cli_set(base_path + ['address-family', 'ipv4-unicast', 'maximum-paths', 'ebgp', max_path_v4]) self.cli_set(base_path + ['address-family', 'ipv4-unicast', 'maximum-paths', 'ibgp', max_path_v4ibgp]) + self.cli_set(base_path + ['address-family', 'ipv4-labeled-unicast', 'maximum-paths', 'ebgp', max_path_v4]) + self.cli_set(base_path + ['address-family', 'ipv4-labeled-unicast', 'maximum-paths', 'ibgp', max_path_v4ibgp]) self.cli_set(base_path + ['address-family', 'ipv6-unicast', 'maximum-paths', 'ebgp', max_path_v6]) self.cli_set(base_path + ['address-family', 'ipv6-unicast', 'maximum-paths', 'ibgp', max_path_v6ibgp]) @@ -373,6 +375,10 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase): self.assertIn(f' maximum-paths {max_path_v4}', afiv4_config) self.assertIn(f' maximum-paths ibgp {max_path_v4ibgp}', afiv4_config) + afiv4_config = self.getFRRconfig(' address-family ipv4 labeled-unicast') + self.assertIn(f' maximum-paths {max_path_v4}', afiv4_config) + self.assertIn(f' maximum-paths ibgp {max_path_v4ibgp}', afiv4_config) + afiv6_config = self.getFRRconfig(' address-family ipv6 unicast') self.assertIn(f' maximum-paths {max_path_v6}', afiv6_config) self.assertIn(f' maximum-paths ibgp {max_path_v6ibgp}', afiv6_config) |