Skip to content

bgp: T7760: remove per vrf instance system-as node #4684

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

Merged
merged 2 commits into from
Sep 23, 2025
Merged

bgp: T7760: remove per vrf instance system-as node #4684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d871fe9
bgp: T7760: deprecate per bgp vrf instance system-as node
c-po Aug 28, 2025
85fe32f
bgp: T7760: remove per vrf instance system-as node
c-po Sep 9, 2025
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
6 changes: 5 additions & 1 deletion data/templates/frr/bgpd.frr.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,11 @@
{# j2lint: disable=jinja-statements-delimeter #}
{%- endmacro -%}
!
router bgp {{ system_as }} {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
{% if vrf is vyos_defined %}
router bgp {{ dependent_vrfs.default.protocols.bgp.system_as }} vrf {{ vrf }}
{% else %}
router bgp {{ system_as }}
{% endif %}
{% if parameters.ebgp_requires_policy is vyos_defined %}
bgp ebgp-requires-policy
{% else %}
Expand Down
12 changes: 0 additions & 12 deletions interface-definitions/include/bgp/protocol-common-config.xml.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,18 +1005,6 @@
</tagNode>
</children>
</node>
<leafNode name="system-as">
<properties>
<help>Autonomous System Number (ASN)</help>
<valueHelp>
<format>u32:1-4294967294</format>
<description>Autonomous System Number</description>
</valueHelp>
<constraint>
<validator name="numeric" argument="--range 1-4294967294"/>
</constraint>
</properties>
</leafNode>
<tagNode name="neighbor">
<properties>
<help>BGP neighbor</help>
Expand Down
2 changes: 1 addition & 1 deletion interface-definitions/include/version/bgp-version.xml.i
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!-- include start from include/version/bgp-version.xml.i -->
<syntaxVersion component='bgp' version='6'></syntaxVersion>
<syntaxVersion component='bgp' version='8'></syntaxVersion>
<!-- include end -->
12 changes: 12 additions & 0 deletions interface-definitions/protocols_bgp.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@
</properties>
<children>
#include <include/bgp/protocol-common-config.xml.i>
<leafNode name="system-as">
<properties>
<help>Autonomous System Number (ASN)</help>
<valueHelp>
<format>u32:1-4294967294</format>
<description>Autonomous System Number</description>
</valueHelp>
<constraint>
<validator name="numeric" argument="--range 1-4294967294"/>
</constraint>
</properties>
</leafNode>
</children>
</node>
</children>
Expand Down
3 changes: 0 additions & 3 deletions smoketest/config-tests/bgp-evpn-l3vpn-pe-router
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,19 +105,16 @@ set system syslog local facility all level 'info'
set system syslog local facility local7 level 'debug'
set vrf name blue protocols bgp address-family ipv4-unicast redistribute connected
set vrf name blue protocols bgp address-family l2vpn-evpn advertise ipv4 unicast
set vrf name blue protocols bgp system-as '100'
set vrf name blue table '2000'
set vrf name blue vni '2000'
set vrf name green protocols bgp address-family ipv4-unicast redistribute connected
set vrf name green protocols bgp address-family l2vpn-evpn advertise ipv4 unicast
set vrf name green protocols bgp system-as '100'
set vrf name green table '4000'
set vrf name green vni '4000'
set vrf name mgmt protocols static route 0.0.0.0/0 next-hop 192.0.2.62
set vrf name mgmt protocols static route6 ::/0 next-hop 2001:db8:ffff::1
set vrf name mgmt table '1000'
set vrf name red protocols bgp address-family ipv4-unicast redistribute connected
set vrf name red protocols bgp address-family l2vpn-evpn advertise ipv4 unicast
set vrf name red protocols bgp system-as '100'
set vrf name red table '3000'
set vrf name red vni '3000'
107 changes: 107 additions & 0 deletions smoketest/config-tests/bgp-evpn-l3vpn-vrf-different-asn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
set interfaces bridge br2000 address '10.10.7.1/30'
set interfaces bridge br2000 description 'customer blue'
set interfaces bridge br2000 member interface eth2.2600
set interfaces bridge br2000 member interface vxlan2000
set interfaces bridge br2000 vrf 'blue'
set interfaces dummy dum0 address '10.255.253.1/32'
set interfaces dummy dum0 address '10.255.253.24/32'
set interfaces ethernet eth0 duplex 'auto'
set interfaces ethernet eth0 offload gro
set interfaces ethernet eth0 offload gso
set interfaces ethernet eth0 offload sg
set interfaces ethernet eth0 offload tso
set interfaces ethernet eth0 speed 'auto'
set interfaces ethernet eth0 vif 6 address '192.168.0.1/24'
set interfaces ethernet eth0 vif 6 vrf 'green'
set interfaces ethernet eth1 duplex 'auto'
set interfaces ethernet eth1 speed 'auto'
set interfaces ethernet eth1 vif 101 address '192.0.2.1/31'
set interfaces ethernet eth1 vif 888 address '192.0.2.3/31'
set interfaces ethernet eth1 vif 888 vrf 'blue'
set interfaces ethernet eth2 duplex 'auto'
set interfaces ethernet eth2 speed 'auto'
set interfaces ethernet eth2 vif 1111 address '192.0.2.11/31'
set interfaces ethernet eth2 vif 1111 vrf 'red'
set interfaces ethernet eth2 vif 1113 address '192.0.2.13/31'
set interfaces ethernet eth2 vif 1113 vrf 'red'
set interfaces ethernet eth2 vif 2600
set interfaces vxlan vxlan2000 mtu '1500'
set interfaces vxlan vxlan2000 parameters nolearning
set interfaces vxlan vxlan2000 port '4789'
set interfaces vxlan vxlan2000 source-address '10.255.253.1'
set interfaces vxlan vxlan2000 vni '2000'
set protocols bgp address-family l2vpn-evpn advertise ipv4 unicast
set protocols bgp address-family l2vpn-evpn advertise-all-vni
set protocols bgp neighbor 10.255.253.9 address-family ipv4-unicast allowas-in number '10'
set protocols bgp neighbor 10.255.253.9 address-family ipv4-unicast nexthop-self
set protocols bgp neighbor 10.255.253.9 remote-as 'internal'
set protocols bgp neighbor 10.255.253.9 update-source '10.255.253.1'
set protocols bgp neighbor 10.255.253.25 peer-group 'EVPN'
set protocols bgp parameters log-neighbor-changes
set protocols bgp parameters network-import-check
set protocols bgp parameters router-id '10.255.253.1'
set protocols bgp peer-group EVPN address-family l2vpn-evpn
set protocols bgp peer-group EVPN remote-as '100'
set protocols bgp peer-group EVPN update-source 'dum0'
set protocols bgp system-as '100'
set protocols ospf interface dum0 area '0'
set protocols ospf interface eth1.101 area '0'
set protocols ospf interface eth1.101 network 'broadcast'
set protocols ospf log-adjacency-changes detail
set protocols ospf parameters router-id '10.255.253.1'
set service ntp allow-client address '0.0.0.0/0'
set service ntp allow-client address '::/0'
set service ntp server 0.pool.ntp.org
set service ntp server 1.pool.ntp.org
set service ntp server 2.pool.ntp.org
set service ssh disable-host-validation
set service ssh port '22'
set system config-management commit-revisions '20'
set system conntrack modules ftp
set system conntrack modules h323
set system conntrack modules nfs
set system conntrack modules pptp
set system conntrack modules sip
set system conntrack modules sqlnet
set system conntrack modules tftp
set system console device ttyS0 speed '115200'
set system domain-name 'vyos.net'
set system host-name 'evpn-l3vpn-vrf-foo'
set system login user vyos authentication encrypted-password '$6$O5gJRlDYQpj$MtrCV9lxMnZPMbcxlU7.FI793MImNHznxGoMFgm3Q6QP3vfKJyOSRCt3Ka/GzFQyW1yZS4NS616NLHaIPPFHc0'
set system login user vyos authentication plaintext-password ''
set system option ctrl-alt-delete 'reboot'
set system option reboot-on-panic
set system syslog console facility all level 'emerg'
set system syslog console facility mail level 'info'
set system syslog local facility all level 'info'
set system syslog local facility local7 level 'debug'
set system syslog preserve-fqdn
set system time-zone 'Europe/Berlin'
set vrf name blue protocols bgp address-family ipv4-unicast redistribute connected
set vrf name blue protocols bgp neighbor 192.0.2.2 address-family ipv4-unicast allowas-in number '1'
set vrf name blue protocols bgp neighbor 192.0.2.2 address-family ipv4-unicast maximum-prefix '20'
set vrf name blue protocols bgp neighbor 192.0.2.2 local-as 667 no-prepend replace-as
set vrf name blue protocols bgp neighbor 192.0.2.2 remote-as '100'
set vrf name blue protocols bgp neighbor 192.0.2.4 address-family ipv4-unicast maximum-prefix '40'
set vrf name blue protocols bgp neighbor 192.0.2.4 local-as 200
set vrf name blue protocols bgp neighbor 192.0.2.4 remote-as '300'
set vrf name blue protocols bgp neighbor 192.0.2.6 address-family ipv4-unicast allowas-in number '7'
set vrf name blue protocols bgp neighbor 192.0.2.6 local-as 667 no-prepend replace-as
set vrf name blue protocols bgp neighbor 192.0.2.6 remote-as '112'
set vrf name blue table '2001'
set vrf name blue vni '2001'
set vrf name green table '4001'
set vrf name red protocols bgp address-family ipv4-unicast redistribute connected
set vrf name red protocols bgp neighbor 192.0.2.10 peer-group 'foo'
set vrf name red protocols bgp neighbor 192.0.2.12 address-family ipv4-unicast allowas-in number '10'
set vrf name red protocols bgp neighbor 192.0.2.12 local-as 65412 no-prepend replace-as
set vrf name red protocols bgp neighbor 192.0.2.12 peer-group 'bar'
set vrf name red protocols bgp neighbor 192.0.2.14 local-as 1111 no-prepend replace-as
set vrf name red protocols bgp neighbor 192.0.2.14 peer-group 'foo'
set vrf name red protocols bgp peer-group bar address-family ipv4-unicast allowas-in number '10'
set vrf name red protocols bgp peer-group bar remote-as '333'
set vrf name red protocols bgp peer-group foo address-family ipv4-unicast soft-reconfiguration inbound
set vrf name red protocols bgp peer-group foo local-as 1000
set vrf name red protocols bgp peer-group foo remote-as '300'
set vrf name red table '3001'
set vrf name red vni '3001'
2 changes: 1 addition & 1 deletion smoketest/config-tests/vrf-bgp-pppoe-underlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ set policy prefix-list6 AS100-origin-v6 rule 10 action 'permit'
set policy prefix-list6 AS100-origin-v6 rule 10 prefix '2001:db8:200::/40'
set policy prefix-list6 AS200-origin-v6 rule 10 action 'permit'
set policy prefix-list6 AS200-origin-v6 rule 10 prefix '2001:db8:100::/40'
set protocols bgp system-as '100'
set protocols static route 100.64.50.0/23 next-hop 100.64.51.221
set protocols static route 192.0.2.255/32 interface pppoe7
set protocols static route6 2001:db8:ffff:ffff:ffff:ffff:ffff:ffff/128 interface pppoe7
Expand Down Expand Up @@ -178,7 +179,6 @@ set vrf name vyos-test-01 protocols bgp peer-group AS100v6 address-family ipv6-u
set vrf name vyos-test-01 protocols bgp peer-group AS100v6 capability dynamic
set vrf name vyos-test-01 protocols bgp peer-group AS100v6 remote-as 'internal'
set vrf name vyos-test-01 protocols bgp peer-group AS100v6 update-source 'dum0'
set vrf name vyos-test-01 protocols bgp system-as '100'
set vrf name vyos-test-01 protocols static route 100.64.50.0/23 blackhole
set vrf name vyos-test-01 protocols static route 100.64.51.32/27 next-hop 100.64.51.5
set vrf name vyos-test-01 protocols static route 192.168.0.0/24 next-hop 100.64.51.220
Expand Down
Loading
Loading