From: Alexandre Derumier Date: Sun, 3 Dec 2023 15:46:09 +0000 (+0100) Subject: controllers: evpn: frr config cleanup X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=dbacff605fce2b579cc4c9b8c33fdf60ac23f464;p=matthieu%2Fpve-network.git controllers: evpn: frr config cleanup 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 --- diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm index f1605a3..648f341 100644 --- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm +++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm @@ -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"; diff --git a/src/test/zones/evpn/advertise_subnets/expected_controller_config b/src/test/zones/evpn/advertise_subnets/expected_controller_config index 15f4581..473a470 100644 --- a/src/test/zones/evpn/advertise_subnets/expected_controller_config +++ b/src/test/zones/evpn/advertise_subnets/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config b/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config index d5d310d..9d8ec60 100644 --- a/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config +++ b/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/ebgp/expected_controller_config b/src/test/zones/evpn/ebgp/expected_controller_config index 1f14b80..8dfb6de 100644 --- a/src/test/zones/evpn/ebgp/expected_controller_config +++ b/src/test/zones/evpn/ebgp/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/ebgp_loopback/expected_controller_config b/src/test/zones/evpn/ebgp_loopback/expected_controller_config index 1add7f5..82eef11 100644 --- a/src/test/zones/evpn/ebgp_loopback/expected_controller_config +++ b/src/test/zones/evpn/ebgp_loopback/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/exitnode/expected_controller_config b/src/test/zones/evpn/exitnode/expected_controller_config index f327e34..50b702b 100644 --- a/src/test/zones/evpn/exitnode/expected_controller_config +++ b/src/test/zones/evpn/exitnode/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config index 5b96cd8..456574d 100644 --- a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config +++ b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/exitnode_primary/expected_controller_config b/src/test/zones/evpn/exitnode_primary/expected_controller_config index b7f2db5..28c91a5 100644 --- a/src/test/zones/evpn/exitnode_primary/expected_controller_config +++ b/src/test/zones/evpn/exitnode_primary/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/exitnode_snat/expected_controller_config b/src/test/zones/evpn/exitnode_snat/expected_controller_config index f327e34..50b702b 100644 --- a/src/test/zones/evpn/exitnode_snat/expected_controller_config +++ b/src/test/zones/evpn/exitnode_snat/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/exitnodenullroute/expected_controller_config b/src/test/zones/evpn/exitnodenullroute/expected_controller_config index 1728c02..e05fc77 100644 --- a/src/test/zones/evpn/exitnodenullroute/expected_controller_config +++ b/src/test/zones/evpn/exitnodenullroute/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/ipv4/expected_controller_config b/src/test/zones/evpn/ipv4/expected_controller_config index d5d310d..9d8ec60 100644 --- a/src/test/zones/evpn/ipv4/expected_controller_config +++ b/src/test/zones/evpn/ipv4/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/ipv4ipv6/expected_controller_config b/src/test/zones/evpn/ipv4ipv6/expected_controller_config index d5d310d..9d8ec60 100644 --- a/src/test/zones/evpn/ipv4ipv6/expected_controller_config +++ b/src/test/zones/evpn/ipv4ipv6/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config index d5d310d..9d8ec60 100644 --- a/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config +++ b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/ipv6/expected_controller_config b/src/test/zones/evpn/ipv6/expected_controller_config index d5d310d..9d8ec60 100644 --- a/src/test/zones/evpn/ipv6/expected_controller_config +++ b/src/test/zones/evpn/ipv6/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/isis/expected_controller_config b/src/test/zones/evpn/isis/expected_controller_config index 8d1706a..9ec8c01 100644 --- a/src/test/zones/evpn/isis/expected_controller_config +++ b/src/test/zones/evpn/isis/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/isis_loopback/expected_controller_config b/src/test/zones/evpn/isis_loopback/expected_controller_config index 7b034c4..5a7f5c9 100644 --- a/src/test/zones/evpn/isis_loopback/expected_controller_config +++ b/src/test/zones/evpn/isis_loopback/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/multipath_relax/expected_controller_config b/src/test/zones/evpn/multipath_relax/expected_controller_config index f0316cc..a87cdc4 100644 --- a/src/test/zones/evpn/multipath_relax/expected_controller_config +++ b/src/test/zones/evpn/multipath_relax/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/multiplezones/expected_controller_config b/src/test/zones/evpn/multiplezones/expected_controller_config index 8d578f7..37f663a 100644 --- a/src/test/zones/evpn/multiplezones/expected_controller_config +++ b/src/test/zones/evpn/multiplezones/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/rt_import/expected_controller_config b/src/test/zones/evpn/rt_import/expected_controller_config index f394b84..5bdb148 100644 --- a/src/test/zones/evpn/rt_import/expected_controller_config +++ b/src/test/zones/evpn/rt_import/expected_controller_config @@ -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 diff --git a/src/test/zones/evpn/vxlanport/expected_controller_config b/src/test/zones/evpn/vxlanport/expected_controller_config index d5d310d..9d8ec60 100644 --- a/src/test/zones/evpn/vxlanport/expected_controller_config +++ b/src/test/zones/evpn/vxlanport/expected_controller_config @@ -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