Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bgp: T2100: Changing RFC8212 behavior and option toggle #744

Merged
merged 1 commit into from Feb 26, 2021
Merged

bgp: T2100: Changing RFC8212 behavior and option toggle #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions data/templates/frr/bgp.frr.tmpl
View file
Open in desktop
Expand Up @@ -178,9 +178,11 @@
{% endmacro %}
!
router bgp {{ asn }}
{# Disable eBGP policy by default until there is a CLI option #}
{# Workaround for T3183 until we have decided about a migration script #}
{% if parameters is defined and parameters.ebgp_requires_policy is defined %}
bgp ebgp-requires-policy
{% else %}
no bgp ebgp-requires-policy
{% endif %}
{# Workaround for T2100 until we have decided about a migration script #}
no bgp network import-check
{% if address_family is defined and address_family is not none %}
Expand Down
6 changes: 6 additions & 0 deletions interface-definitions/protocols-bgp.xml.in
View file
Open in desktop
Expand Up @@ -805,6 +805,12 @@
</tagNode>
</children>
</node>
<leafNode name="ebgp-requires-policy">
<properties>
<help>Enable RFC8212 functionality</help>
<valueless/>
</properties>
</leafNode>
<node name="graceful-restart">
<properties>
<help>Graceful restart capability parameters</help>
Expand Down
4 changes: 3 additions & 1 deletion smoketest/scripts/cli/test_protocols_bgp.py
View file
Open in desktop
Expand Up @@ -221,12 +221,13 @@ def test_bgp_01_simple(self):

self.session.set(base_path + ['parameters', 'router-id', router_id])
self.session.set(base_path + ['parameters', 'log-neighbor-changes'])
# Default local preference (higher=more preferred)
# Default local preference (higher = more preferred, default value is 100)
self.session.set(base_path + ['parameters', 'default', 'local-pref', local_pref])
# Deactivate IPv4 unicast for a peer by default
self.session.set(base_path + ['parameters', 'default', 'no-ipv4-unicast'])
self.session.set(base_path + ['parameters', 'graceful-restart', 'stalepath-time', stalepath_time])
self.session.set(base_path + ['parameters', 'graceful-shutdown'])
self.session.set(base_path + ['parameters', 'ebgp-requires-policy'])
c-po marked this conversation as resolved.
Show resolved Hide resolved

# commit changes
self.session.commit()
Expand All @@ -240,6 +241,7 @@ def test_bgp_01_simple(self):
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)


def test_bgp_02_neighbors(self):
Expand Down