evpn: update config to frr 8.5.1

add default values:
 "no bgp hard-administrative-reset"
 "no bgp graceful-restart notification"

to avoid frr-reload warning

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

18 files changed, 95 insertions, 18 deletions

diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
index b1eb845..6da9c40 100644
--- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
@@ -71,6 +71,8 @@ sub generate_controller_config {
     #global options
     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",
     );
@@ -166,6 +168,9 @@ sub generate_controller_zone_config {
     #main vrf router
     @controller_config = ();
     push @controller_config, "bgp router-id $ifaceip";
+    push @controller_config, "no bgp hard-administrative-reset";
+    push @controller_config, "no bgp graceful-restart notification";
+
 #    push @controller_config, "!";
     push(@{$config->{frr}->{router}->{"bgp $asn vrf $vrf"}->{""}}, @controller_config);
 
@@ -428,7 +433,7 @@ sub generate_controller_rawconfig {
     my $nodename = PVE::INotify::nodename();
 
     my $final_config = [];
-    push @{$final_config}, "frr version 8.2.2";
+    push @{$final_config}, "frr version 8.5.1";
     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 82b06b4..15f4581 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -29,6 +31,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
  !
  address-family ipv4 unicast
   redistribute connected
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 bd7830a..d5d310d 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -29,6 +31,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
 exit
 !
 route-map MAP_VTEP_IN permit 1
diff --git a/src/test/zones/evpn/ebgp/expected_controller_config b/src/test/zones/evpn/ebgp/expected_controller_config
index ccc0b28..1f14b80 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -41,6 +43,8 @@ exit
 !
 router bgp 65001 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
  !
  address-family l2vpn evpn
   route-target import 65000:1000
diff --git a/src/test/zones/evpn/ebgp_loopback/expected_controller_config b/src/test/zones/evpn/ebgp_loopback/expected_controller_config
index 47836f8..1add7f5 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -44,6 +46,8 @@ exit
 !
 router bgp 65001 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
  !
  address-family l2vpn evpn
   route-target import 65000:1000
diff --git a/src/test/zones/evpn/exitnode/expected_controller_config b/src/test/zones/evpn/exitnode/expected_controller_config
index 2c3f19e..598233f 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -37,6 +39,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
  !
  address-family ipv4 unicast
   redistribute connected
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 ef3948d..8c8e485 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -29,6 +31,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
  !
  address-family l2vpn evpn
   default-originate ipv4
diff --git a/src/test/zones/evpn/exitnode_primary/expected_controller_config b/src/test/zones/evpn/exitnode_primary/expected_controller_config
index e45b22c..ec73a38 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -37,6 +39,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
  !
  address-family ipv4 unicast
   redistribute connected
diff --git a/src/test/zones/evpn/exitnode_snat/expected_controller_config b/src/test/zones/evpn/exitnode_snat/expected_controller_config
index 2c3f19e..598233f 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -37,6 +39,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
  !
  address-family ipv4 unicast
   redistribute connected
diff --git a/src/test/zones/evpn/exitnodenullroute/expected_controller_config b/src/test/zones/evpn/exitnodenullroute/expected_controller_config
index f461f1e..7dc8517 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -18,6 +18,8 @@ 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
  neighbor VTEP peer-group
@@ -46,6 +48,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
  !
  address-family ipv4 unicast
   redistribute connected
@@ -63,6 +67,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone2
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
  !
  address-family ipv4 unicast
   redistribute connected
diff --git a/src/test/zones/evpn/ipv4/expected_controller_config b/src/test/zones/evpn/ipv4/expected_controller_config
index bd7830a..d5d310d 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -29,6 +31,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
 exit
 !
 route-map MAP_VTEP_IN permit 1
diff --git a/src/test/zones/evpn/ipv4ipv6/expected_controller_config b/src/test/zones/evpn/ipv4ipv6/expected_controller_config
index bd7830a..d5d310d 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -29,6 +31,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
 exit
 !
 route-map MAP_VTEP_IN permit 1
diff --git a/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config
index bd7830a..d5d310d 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -29,6 +31,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
 exit
 !
 route-map MAP_VTEP_IN permit 1
diff --git a/src/test/zones/evpn/ipv6/expected_controller_config b/src/test/zones/evpn/ipv6/expected_controller_config
index bd7830a..d5d310d 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -29,6 +31,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
 exit
 !
 route-map MAP_VTEP_IN permit 1
diff --git a/src/test/zones/evpn/multipath_relax/expected_controller_config b/src/test/zones/evpn/multipath_relax/expected_controller_config
index 2d1ad44..f0316cc 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -41,6 +43,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
 exit
 !
 route-map MAP_VTEP_IN permit 1
diff --git a/src/test/zones/evpn/multiplezones/expected_controller_config b/src/test/zones/evpn/multiplezones/expected_controller_config
index d6dfa73..8d578f7 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -15,6 +15,8 @@ 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
  neighbor VTEP peer-group
@@ -33,10 +35,14 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
 exit
 !
 router bgp 65000 vrf vrf_myzone2
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
 exit
 !
 route-map MAP_VTEP_IN permit 1
diff --git a/src/test/zones/evpn/rt_import/expected_controller_config b/src/test/zones/evpn/rt_import/expected_controller_config
index f4f28dd..f394b84 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -29,6 +31,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
  !
  address-family l2vpn evpn
   route-target import 65001:1000
diff --git a/src/test/zones/evpn/vxlanport/expected_controller_config b/src/test/zones/evpn/vxlanport/expected_controller_config
index bd7830a..d5d310d 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.2.2
+frr version 8.5.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
@@ -11,6 +11,8 @@ 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
  neighbor VTEP peer-group
@@ -29,6 +31,8 @@ exit
 !
 router bgp 65000 vrf vrf_myzone
  bgp router-id 192.168.0.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
 exit
 !
 route-map MAP_VTEP_IN permit 1