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.

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

policy: T7116: Remove unsupported use of BGP community "internet" #4371

Merged
merged 2 commits into from
Feb 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
local-as
no-advertise
no-export
internet
graceful-shutdown
accept-own
route-filter-translated-v4
Expand Down Expand Up @@ -34,10 +33,6 @@
<format>no-export</format>
<description>Well-known communities value NO_EXPORT 0xFFFFFF01</description>
</valueHelp>
<valueHelp>
<format>internet</format>
<description>Well-known communities value 0</description>
</valueHelp>
<valueHelp>
<format>graceful-shutdown</format>
<description>Well-known communities value GRACEFUL_SHUTDOWN 0xFFFF0000</description>
Expand Down Expand Up @@ -84,7 +79,7 @@
</valueHelp>
<multi/>
<constraint>
<regex>local-as|no-advertise|no-export|internet|graceful-shutdown|accept-own|route-filter-translated-v4|route-filter-v4|route-filter-translated-v6|route-filter-v6|llgr-stale|no-llgr|accept-own-nexthop|blackhole|no-peer</regex>
<regex>local-as|no-advertise|no-export|graceful-shutdown|accept-own|route-filter-translated-v4|route-filter-v4|route-filter-translated-v6|route-filter-v6|llgr-stale|no-llgr|accept-own-nexthop|blackhole|no-peer</regex>
<validator name="bgp-regular-community"/>
</constraint>
<!-- include end -->
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!-- include start from include/version/policy-version.xml.i -->
<syntaxVersion component='policy' version='8'></syntaxVersion>
<syntaxVersion component='policy' version='9'></syntaxVersion>
<!-- include end -->
6 changes: 1 addition & 5 deletions interface-definitions/policy.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
<properties>
<help>Regular expression to match against a community-list</help>
<completionHelp>
<list>local-AS no-advertise no-export internet graceful-shutdown accept-own-nexthop accept-own route-filter-translated-v4 route-filter-v4 route-filter-translated-v6 route-filter-v6 llgr-stale no-llgr blackhole no-peer additive</list>
<list>local-AS no-advertise no-export graceful-shutdown accept-own-nexthop accept-own route-filter-translated-v4 route-filter-v4 route-filter-translated-v6 route-filter-v6 llgr-stale no-llgr blackhole no-peer additive</list>
</completionHelp>
<valueHelp>
<format>&lt;aa:nn&gt;</format>
Expand All @@ -220,10 +220,6 @@
<format>no-export</format>
<description>Well-known communities value NO_EXPORT 0xFFFFFF01</description>
</valueHelp>
<valueHelp>
<format>internet</format>
<description>Well-known communities value 0</description>
</valueHelp>
<valueHelp>
<format>graceful-shutdown</format>
<description>Well-known communities value GRACEFUL_SHUTDOWN 0xFFFF0000</description>
Expand Down
49 changes: 49 additions & 0 deletions src/migration-scripts/policy/8-to-9
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Copyright (C) 2025 VyOS maintainers and contributors <[email protected]>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.

# T7116: Remove unsupported "internet" community following FRR removal
# From
# set policy route-map <name> rule <ord> set community [add | replace] internet
# set policy community-list <name> rule <ord> regex internet
# To
# set policy route-map <name> rule <ord> set community [add | replace] 0:0
# set policy community-list <name> rule <ord> regex _0:0_

# NOTE: In FRR expanded community-lists, without the '_' delimiters, a regex of
# "0:0" will match "65000:0" as well as "0:0". This doesn't line up with what
# we want when replacing "internet".

from vyos.configtree import ConfigTree

rm_base = ['policy', 'route-map']
cl_base = ['policy', 'community-list']

def migrate(config: ConfigTree) -> None:
if config.exists(rm_base):
for policy_name in config.list_nodes(rm_base):
for rule_ord in config.list_nodes(rm_base + [policy_name, 'rule'], path_must_exist=False):
tmp_path = rm_base + [policy_name, 'rule', rule_ord, 'set', 'community']
if config.exists(tmp_path + ['add']) and config.return_value(tmp_path + ['add']) == 'internet':
config.set(tmp_path + ['add'], '0:0')
if config.exists(tmp_path + ['replace']) and config.return_value(tmp_path + ['replace']) == 'internet':
config.set(tmp_path + ['replace'], '0:0')

if config.exists(cl_base):
for policy_name in config.list_nodes(cl_base):
for rule_ord in config.list_nodes(cl_base + [policy_name, 'rule'], path_must_exist=False):
tmp_path = cl_base + [policy_name, 'rule', rule_ord, 'regex']
if config.exists(tmp_path) and config.return_value(tmp_path) == 'internet':
config.set(tmp_path, '_0:0_')

Loading