diff options
| -rw-r--r-- | interface-definitions/protocols-bgp.xml.in | 2 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_protocols_bgp.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in index 46b913830..cc4f9d2b6 100644 --- a/interface-definitions/protocols-bgp.xml.in +++ b/interface-definitions/protocols-bgp.xml.in @@ -815,7 +815,7 @@ </node> <leafNode name="ebgp-requires-policy"> <properties> - <help>Enable RFC8212 functionality</help> + <help>Require in and out policy for eBGP peers (RFC8212)</help> <valueless/> </properties> </leafNode> diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py index 607dfc116..8d42fafc3 100755 --- a/smoketest/scripts/cli/test_protocols_bgp.py +++ b/smoketest/scripts/cli/test_protocols_bgp.py @@ -241,7 +241,7 @@ class TestProtocolsBGP(unittest.TestCase): self.assertIn(f' no bgp default ipv4-unicast', frrconfig) self.assertIn(f' bgp graceful-restart stalepath-time {stalepath_time}', frrconfig) self.assertIn(f' bgp graceful-shutdown', frrconfig) - self.assertIn(f' bgp ebgp-requires-policy', frrconfig) + self.assertNotIn(f'bgp ebgp-requires-policy', frrconfig) def test_bgp_02_neighbors(self): @@ -455,6 +455,9 @@ class TestProtocolsBGP(unittest.TestCase): frrconfig = getFRRBGPconfig() self.assertIn(f'router bgp {ASN}', frrconfig) self.assertIn(f' address-family ipv6 unicast', frrconfig) + # T2100: By default ebgp-requires-policy is disabled to keep VyOS + # 1.3 and 1.2 backwards compatibility + self.assertIn(f' no bgp ebgp-requires-policy', frrconfig) for redistribute in redistributes: # FRR calls this OSPF6 |