Proxmox/pve-network
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-network.git synced 2025-01-21 22:03:53 +03:00
Code Releases Activity

controllers: evpn: frr config cleanup

Browse Source 
Some values have been reordered in last version

- bump version to 8.5.2
- move no bgp graceful-restart notification
- move neighbor VTEP activate

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2023-12-03 16:46:09 +01:00 committed by Thomas Lamprecht
parent e614da43f1
commit dbacff605f
20 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
View File

@ -77,9 +77,9 @@ sub generate_controller_config {
my @controller_config = (
"bgp router-id $ifaceip",
"no bgp hard-administrative-reset",
"no bgp graceful-restart notification",
"no bgp default ipv4-unicast",
"coalesce-time 1000",
"no bgp graceful-restart notification",
);
push(@{$bgp->{""}}, @controller_config) if keys %{$bgp} == 0;
@ -104,9 +104,9 @@ sub generate_controller_config {
# address-family l2vpn
@controller_config = ();
push @controller_config, "neighbor VTEP activate";
push @controller_config, "neighbor VTEP route-map MAP_VTEP_IN in";
push @controller_config, "neighbor VTEP route-map MAP_VTEP_OUT out";
push @controller_config, "neighbor VTEP activate";
push @controller_config, "advertise-all-vni";
push @controller_config, "autort as $autortas" if $autortas;
push(@{$bgp->{"address-family"}->{"l2vpn evpn"}}, @controller_config);
@ -479,7 +479,7 @@ sub generate_controller_rawconfig {
my $nodename = PVE::INotify::nodename();
my $final_config = [];
push @{$final_config}, "frr version 8.5.1";
push @{$final_config}, "frr version 8.5.2";
push @{$final_config}, "frr defaults datacenter";
push @{$final_config}, "hostname $nodename";
push @{$final_config}, "log syslog informational";

6
src/test/zones/evpn/advertise_subnets/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -22,9 +22,9 @@ router bgp 65000
neighbor 192.168.0.3 peer-group VTEP
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -22,9 +22,9 @@ router bgp 65000
neighbor 192.168.0.3 peer-group VTEP
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/ebgp/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65001
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as external
neighbor VTEP bfd
@ -33,9 +33,9 @@ router bgp 65001
exit-address-family
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
autort as 65000
exit-address-family

6
src/test/zones/evpn/ebgp_loopback/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65001
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as external
neighbor VTEP bfd
@ -36,9 +36,9 @@ router bgp 65001
exit-address-family
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
autort as 65000
exit-address-family

6
src/test/zones/evpn/exitnode/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -30,9 +30,9 @@ router bgp 65000
exit-address-family
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/exitnode_local_routing/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -22,9 +22,9 @@ router bgp 65000
neighbor 192.168.0.3 peer-group VTEP
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/exitnode_primary/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -30,9 +30,9 @@ router bgp 65000
exit-address-family
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/exitnode_snat/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -30,9 +30,9 @@ router bgp 65000
exit-address-family
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/exitnodenullroute/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -19,9 +19,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -39,9 +39,9 @@ router bgp 65000
exit-address-family
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/ipv4/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -22,9 +22,9 @@ router bgp 65000
neighbor 192.168.0.3 peer-group VTEP
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/ipv4ipv6/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -22,9 +22,9 @@ router bgp 65000
neighbor 192.168.0.3 peer-group VTEP
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -22,9 +22,9 @@ router bgp 65000
neighbor 192.168.0.3 peer-group VTEP
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/ipv6/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -22,9 +22,9 @@ router bgp 65000
neighbor 192.168.0.3 peer-group VTEP
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/isis/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -18,9 +18,9 @@ interface eth1
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -28,9 +28,9 @@ router bgp 65000
neighbor 192.168.0.3 peer-group VTEP
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/isis_loopback/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -18,9 +18,9 @@ interface eth1
router bgp 65000
bgp router-id 10.0.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -29,9 +29,9 @@ router bgp 65000
neighbor 10.0.0.3 peer-group VTEP
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/multipath_relax/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -34,9 +34,9 @@ router bgp 65000
exit-address-family
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/multiplezones/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -16,9 +16,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -26,9 +26,9 @@ router bgp 65000
neighbor 192.168.0.3 peer-group VTEP
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/rt_import/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -22,9 +22,9 @@ router bgp 65000
neighbor 192.168.0.3 peer-group VTEP
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit

6
src/test/zones/evpn/vxlanport/expected_controller_config
View File

@ -1,4 +1,4 @@
frr version 8.5.1
frr version 8.5.2
frr defaults datacenter
hostname localhost
log syslog informational
@ -12,9 +12,9 @@ exit-vrf
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
@ -22,9 +22,9 @@ router bgp 65000
neighbor 192.168.0.3 peer-group VTEP
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
neighbor VTEP activate
advertise-all-vni
exit-address-family
exit