Skip to content

Commit c0617a3

Browse files
authored
bgp: T7760: remove per vrf instance system-as node (#1675)
1 parent ff8f11a commit c0617a3

File tree

5 files changed

+3
-20
lines changed

5 files changed

+3
-20
lines changed

docs/configexamples/autotest/L3VPN_EVPN/_include/PE1.conf

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ set interfaces vxlan vxlan2000 vni '2000'
4545

4646
set vrf name blue protocols bgp address-family ipv4-unicast redistribute connected
4747
set vrf name blue protocols bgp address-family l2vpn-evpn advertise ipv4 unicast
48-
set vrf name blue protocols bgp system-as '100'
4948
set vrf name blue table '2000'
5049
set vrf name blue vni '2000'
5150

@@ -57,7 +56,6 @@ set interfaces vxlan vxlan3000 vni '3000'
5756

5857
set vrf name red protocols bgp address-family ipv4-unicast redistribute connected
5958
set vrf name red protocols bgp address-family l2vpn-evpn advertise ipv4 unicast
60-
set vrf name red protocols bgp system-as '100'
6159
set vrf name red table '3000'
6260
set vrf name red vni '3000'
6361

@@ -69,7 +67,6 @@ set interfaces vxlan vxlan4000 vni '4000'
6967

7068
set vrf name green protocols bgp address-family ipv4-unicast redistribute connected
7169
set vrf name green protocols bgp address-family l2vpn-evpn advertise ipv4 unicast
72-
set vrf name green protocols bgp system-as '100'
7370
set vrf name green table '4000'
7471
set vrf name green vni '4000'
7572

@@ -93,4 +90,4 @@ set interfaces bridge br4000 vrf 'green'
9390

9491
set interfaces ethernet eth4 description 'customer blue'
9592
set interfaces ethernet eth5 description 'customer red'
96-
set interfaces ethernet eth6 description 'customer green'
93+
set interfaces ethernet eth6 description 'customer green'

docs/configexamples/autotest/L3VPN_EVPN/_include/PE2.conf

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ set interfaces vxlan vxlan2000 vni '2000'
4545

4646
set vrf name blue protocols bgp address-family ipv4-unicast redistribute connected
4747
set vrf name blue protocols bgp address-family l2vpn-evpn advertise ipv4 unicast
48-
set vrf name blue protocols bgp system-as '100'
4948
set vrf name blue table '2000'
5049
set vrf name blue vni '2000'
5150

@@ -57,7 +56,6 @@ set interfaces vxlan vxlan3000 vni '3000'
5756

5857
set vrf name red protocols bgp address-family ipv4-unicast redistribute connected
5958
set vrf name red protocols bgp address-family l2vpn-evpn advertise ipv4 unicast
60-
set vrf name red protocols bgp system-as '100'
6159
set vrf name red table '3000'
6260
set vrf name red vni '3000'
6361

@@ -69,7 +67,6 @@ set interfaces vxlan vxlan4000 vni '4000'
6967

7068
set vrf name green protocols bgp address-family ipv4-unicast redistribute connected
7169
set vrf name green protocols bgp address-family l2vpn-evpn advertise ipv4 unicast
72-
set vrf name green protocols bgp system-as '100'
7370
set vrf name green table '4000'
7471
set vrf name green vni '4000'
7572

@@ -86,4 +83,4 @@ set interfaces bridge br3000 member interface vxlan3000
8683
set interfaces bridge br3000 vrf 'red'
8784

8885
set interfaces ethernet eth4 description 'customer blue'
89-
set interfaces ethernet eth5 description 'customer red'
86+
set interfaces ethernet eth5 description 'customer red'

docs/configexamples/autotest/L3VPN_EVPN/_include/PE3.conf

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ set interfaces vxlan vxlan2000 vni '2000'
4545

4646
set vrf name blue protocols bgp address-family ipv4-unicast redistribute connected
4747
set vrf name blue protocols bgp address-family l2vpn-evpn advertise ipv4 unicast
48-
set vrf name blue protocols bgp system-as '100'
4948
set vrf name blue table '2000'
5049
set vrf name blue vni '2000'
5150

@@ -57,7 +56,6 @@ set interfaces vxlan vxlan3000 vni '3000'
5756

5857
set vrf name red protocols bgp address-family ipv4-unicast redistribute connected
5958
set vrf name red protocols bgp address-family l2vpn-evpn advertise ipv4 unicast
60-
set vrf name red protocols bgp system-as '100'
6159
set vrf name red table '3000'
6260
set vrf name red vni '3000'
6361

@@ -69,7 +67,6 @@ set interfaces vxlan vxlan4000 vni '4000'
6967

7068
set vrf name green protocols bgp address-family ipv4-unicast redistribute connected
7169
set vrf name green protocols bgp address-family l2vpn-evpn advertise ipv4 unicast
72-
set vrf name green protocols bgp system-as '100'
7370
set vrf name green table '4000'
7471
set vrf name green vni '4000'
7572

@@ -86,4 +83,4 @@ set interfaces bridge br4000 member interface vxlan4000
8683
set interfaces bridge br4000 vrf 'green'
8784

8885
set interfaces ethernet eth4 description 'customer blue'
89-
set interfaces ethernet eth6 description 'customer green'
86+
set interfaces ethernet eth6 description 'customer green'

docs/configexamples/inter-vrf-routing-vrf-lite.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ to inject configured networks into the BGP process but still inside the VRF.
242242
set protocols bgp system-as <ASN>
243243
244244
# set BGP VRF local-as and redistribution
245-
set vrf name <VRF> protocols bgp system-as <ASN>
246245
set vrf name <VRF> protocols bgp address-family <AF IPv4/IPv6> redistribute static
247246
248247
- Verification
@@ -642,7 +641,6 @@ Full configuration from all devices
642641
set vrf name Internet protocols bgp address-family ipv6-unicast rd vpn export '64496:100'
643642
set vrf name Internet protocols bgp address-family ipv6-unicast route-target vpn export '64496:100'
644643
set vrf name Internet protocols bgp address-family ipv6-unicast route-target vpn import '64496:1 64496:2'
645-
set vrf name Internet protocols bgp system-as '64496'
646644
set vrf name Internet protocols bgp neighbor 10.2.2.2 address-family ipv4-unicast
647645
set vrf name Internet protocols bgp neighbor 10.2.2.2 remote-as '64497'
648646
set vrf name Internet protocols bgp neighbor 2001:db8::7 address-family ipv6-unicast
@@ -660,7 +658,6 @@ Full configuration from all devices
660658
set vrf name LAN1 protocols bgp address-family ipv6-unicast redistribute static
661659
set vrf name LAN1 protocols bgp address-family ipv6-unicast route-target vpn export '64496:1'
662660
set vrf name LAN1 protocols bgp address-family ipv6-unicast route-target vpn import '64496:100 64496:50 64496:2'
663-
set vrf name LAN1 protocols bgp system-as '64496'
664661
set vrf name LAN1 protocols static route 10.0.0.0/24 next-hop 10.1.1.2
665662
set vrf name LAN1 protocols static route6 2001:db8:0:1::/64 next-hop 2001:db8::1
666663
set vrf name LAN1 table '101'
@@ -676,7 +673,6 @@ Full configuration from all devices
676673
set vrf name LAN2 protocols bgp address-family ipv6-unicast redistribute static
677674
set vrf name LAN2 protocols bgp address-family ipv6-unicast route-target vpn export '64496:2'
678675
set vrf name LAN2 protocols bgp address-family ipv6-unicast route-target vpn import '64496:100 64496:50 64496:1'
679-
set vrf name LAN2 protocols bgp system-as '64496'
680676
set vrf name LAN2 protocols static route 172.16.0.0/24 next-hop 172.16.2.2
681677
set vrf name LAN2 protocols static route6 2001:db8:0:2::/64 next-hop 2001:db8::3
682678
set vrf name LAN2 table '102'
@@ -692,7 +688,6 @@ Full configuration from all devices
692688
set vrf name Management protocols bgp address-family ipv6-unicast redistribute static
693689
set vrf name Management protocols bgp address-family ipv6-unicast route-target vpn export '64496:50'
694690
set vrf name Management protocols bgp address-family ipv6-unicast route-target vpn import '64496:1 64496:2'
695-
set vrf name Management protocols bgp system-as '64496'
696691
set vrf name Management protocols static route 192.168.0.0/24 next-hop 192.168.3.2
697692
set vrf name Management protocols static route6 2001:db8:0:3::/64 next-hop 2001:db8::5
698693
set vrf name Management table '103'

docs/configexamples/l3vpn-hub-and-spoke.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,6 @@ import/export based on the pre-defined parameters.
424424
set vrf name BLUE_SPOKE protocols bgp address-family ipv4-unicast redistribute connected
425425
set vrf name BLUE_SPOKE protocols bgp address-family ipv4-unicast route-target vpn export '65035:1011'
426426
set vrf name BLUE_SPOKE protocols bgp address-family ipv4-unicast route-target vpn import '65035:1030'
427-
set vrf name BLUE_SPOKE protocols bgp system-as '65001'
428427
set vrf name BLUE_SPOKE protocols bgp neighbor 10.50.50.2 address-family ipv4-unicast as-override
429428
set vrf name BLUE_SPOKE protocols bgp neighbor 10.50.50.2 remote-as '65035'
430429
@@ -446,7 +445,6 @@ import/export based on the pre-defined parameters.
446445
set vrf name BLUE_HUB protocols bgp address-family ipv4-unicast redistribute connected
447446
set vrf name BLUE_HUB protocols bgp address-family ipv4-unicast route-target vpn export '65035:1030'
448447
set vrf name BLUE_HUB protocols bgp address-family ipv4-unicast route-target vpn import '65035:1011 65050:2011 65035:1030'
449-
set vrf name BLUE_HUB protocols bgp system-as '65001'
450448
set vrf name BLUE_HUB protocols bgp neighbor 10.80.80.2 address-family ipv4-unicast as-override
451449
set vrf name BLUE_HUB protocols bgp neighbor 10.80.80.2 remote-as '65035'
452450
@@ -468,7 +466,6 @@ import/export based on the pre-defined parameters.
468466
set vrf name BLUE_SPOKE protocols bgp address-family ipv4-unicast redistribute connected
469467
set vrf name BLUE_SPOKE protocols bgp address-family ipv4-unicast route-target vpn export '65035:1011'
470468
set vrf name BLUE_SPOKE protocols bgp address-family ipv4-unicast route-target vpn import '65035:1030'
471-
set vrf name BLUE_SPOKE protocols bgp system-as '65001'
472469
set vrf name BLUE_SPOKE protocols bgp neighbor 10.60.60.2 address-family ipv4-unicast as-override
473470
set vrf name BLUE_SPOKE protocols bgp neighbor 10.60.60.2 remote-as '65035'
474471

0 commit comments

Comments
 (0)