From 010c4061a8884a3617368f3618a425dc517d0675 Mon Sep 17 00:00:00 2001 From: fett0 Date: Fri, 29 Mar 2024 13:01:19 +0000 Subject: bgp: T6010: Allow configuration of disable-ebgp-connected-route-check --- data/templates/frr/bgpd.frr.j2 | 3 +++ interface-definitions/include/bgp/protocol-common-config.xml.i | 6 ++++++ smoketest/scripts/cli/test_protocols_bgp.py | 2 ++ 3 files changed, 11 insertions(+) diff --git a/data/templates/frr/bgpd.frr.j2 b/data/templates/frr/bgpd.frr.j2 index e9422b257..7d1241f5a 100644 --- a/data/templates/frr/bgpd.frr.j2 +++ b/data/templates/frr/bgpd.frr.j2 @@ -537,6 +537,9 @@ router bgp {{ system_as }} {{ 'vrf ' ~ vrf if vrf is vyos_defined }} {% if parameters.allow_martian_nexthop is vyos_defined %} bgp allow-martian-nexthop {% endif %} +{% if parameters.disable_ebgp_connected_route_check is vyos_defined %} + bgp disable-ebgp-connected-route-check +{% endif %} {% if parameters.always_compare_med is vyos_defined %} bgp always-compare-med {% endif %} diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i index ca67eaf3c..616b8fed5 100644 --- a/interface-definitions/include/bgp/protocol-common-config.xml.i +++ b/interface-definitions/include/bgp/protocol-common-config.xml.i @@ -1249,6 +1249,12 @@ + + + Disable checking if nexthop is connected on ebgp session + + + Always compare MEDs from different neighbors diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py index 5f238b25a..8b597e670 100755 --- a/smoketest/scripts/cli/test_protocols_bgp.py +++ b/smoketest/scripts/cli/test_protocols_bgp.py @@ -321,6 +321,7 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase): tcp_keepalive_probes = '22' self.cli_set(base_path + ['parameters', 'allow-martian-nexthop']) + self.cli_set(base_path + ['parameters', 'disable-ebgp-connected-route-check']) self.cli_set(base_path + ['parameters', 'no-hard-administrative-reset']) self.cli_set(base_path + ['parameters', 'log-neighbor-changes']) self.cli_set(base_path + ['parameters', 'labeled-unicast', 'explicit-null']) @@ -372,6 +373,7 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase): self.assertIn(f'router bgp {ASN}', frrconfig) self.assertIn(f' bgp router-id {router_id}', frrconfig) self.assertIn(f' bgp allow-martian-nexthop', frrconfig) + self.assertIn(f' bgp disable-ebgp-connected-route-check', frrconfig) self.assertIn(f' bgp log-neighbor-changes', frrconfig) self.assertIn(f' bgp default local-preference {local_pref}', frrconfig) self.assertIn(f' bgp conditional-advertisement timer {cond_adv_timer}', frrconfig) -- cgit v1.2.3 From 85e5ccbab85c8ded426896d61bcf64d329768f2c Mon Sep 17 00:00:00 2001 From: fett0 Date: Fri, 29 Mar 2024 17:42:06 +0000 Subject: bgp: T6151: Allow configuration of disable-ebgp-connected-route-check --- interface-definitions/include/bgp/protocol-common-config.xml.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i index 616b8fed5..0f05625a7 100644 --- a/interface-definitions/include/bgp/protocol-common-config.xml.i +++ b/interface-definitions/include/bgp/protocol-common-config.xml.i @@ -1251,7 +1251,7 @@ - Disable checking if nexthop is connected on ebgp session + Disable checking if nexthop is connected on eBGP session -- cgit v1.2.3 From 84b6f6bcf59d526c35928c974e3f2d03c4d5ec06 Mon Sep 17 00:00:00 2001 From: fett0 Date: Fri, 29 Mar 2024 20:27:38 +0000 Subject: bgp: T6151: Fix description in PEER disable-connected-check --- .../include/bgp/neighbor-disable-connected-check.xml.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface-definitions/include/bgp/neighbor-disable-connected-check.xml.i b/interface-definitions/include/bgp/neighbor-disable-connected-check.xml.i index cb8b610b4..60b4cb0f1 100644 --- a/interface-definitions/include/bgp/neighbor-disable-connected-check.xml.i +++ b/interface-definitions/include/bgp/neighbor-disable-connected-check.xml.i @@ -1,7 +1,7 @@ - Disable check to see if eBGP peer address is a connected route + Allow peerings between eBGP peer using loopback address -- cgit v1.2.3 From 24d0400b9c55cadef1eb99b3e84a363dd6ad5033 Mon Sep 17 00:00:00 2001 From: fett0 Date: Sun, 31 Mar 2024 15:16:24 +0000 Subject: bgp: T6151: Fix description in PEER disable-connected-check --- .../include/bgp/neighbor-disable-connected-check.xml.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface-definitions/include/bgp/neighbor-disable-connected-check.xml.i b/interface-definitions/include/bgp/neighbor-disable-connected-check.xml.i index 60b4cb0f1..aef5a55e9 100644 --- a/interface-definitions/include/bgp/neighbor-disable-connected-check.xml.i +++ b/interface-definitions/include/bgp/neighbor-disable-connected-check.xml.i @@ -1,7 +1,7 @@ - Allow peerings between eBGP peer using loopback address + Allow peerings between eBGP peer using loopback/dummy address -- cgit v1.2.3