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>

diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
index b1eb845a7fbe0405dc3af979ac3c905f7f51345f..6da9c40a6dbeb9a88cbcde07950b1cd3a5971e6a 100644 (file)
--- 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 82b06b4b59b2b77a5e4b1fc7ac9fbb70bc44db71..15f45815b6575a0f3d46ec08af4778477621c689 100644 (file)
--- 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 bd7830abe9eb33384d939102cf6067227905e21b..d5d310d27d648f5c9a9a6a9b41289ee53e63a5b8 100644 (file)
--- 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 ccc0b2818cf22b1d88a0ae9e26db2456569a45d8..1f14b8031a23346bfdc9ab7b1a7798c80e510334 100644 (file)
--- 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 47836f847c9b83ab8197bf3ccae57c10b370d05a..1add7f5d4d6486bb265b0b5bb6f29ea118015e49 100644 (file)
--- 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 2c3f19e71df4f29b0da97d326e0f8c8d0ea5cc02..598233f8e74867a322078ff5332a6d738e9208c1 100644 (file)
--- 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 ef3948d116284e285839262f5e460353bb02ec1e..8c8e48572c2490464c3412f7ca4737f04bb999da 100644 (file)
--- 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 e45b22ce153df903a492392cff3471977921a3ef..ec73a38d28cfc8f37931165f86f993d8d51344e0 100644 (file)
--- 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 2c3f19e71df4f29b0da97d326e0f8c8d0ea5cc02..598233f8e74867a322078ff5332a6d738e9208c1 100644 (file)
--- 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 f461f1ed9666677ac2555255e14ad502137115b1..7dc85170757f5ab7ddf624650846720e3d15ca39 100644 (file)
--- 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 bd7830abe9eb33384d939102cf6067227905e21b..d5d310d27d648f5c9a9a6a9b41289ee53e63a5b8 100644 (file)
--- 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 bd7830abe9eb33384d939102cf6067227905e21b..d5d310d27d648f5c9a9a6a9b41289ee53e63a5b8 100644 (file)
--- 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 bd7830abe9eb33384d939102cf6067227905e21b..d5d310d27d648f5c9a9a6a9b41289ee53e63a5b8 100644 (file)
--- 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 bd7830abe9eb33384d939102cf6067227905e21b..d5d310d27d648f5c9a9a6a9b41289ee53e63a5b8 100644 (file)
--- 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 2d1ad44f88e611929f601153c9d221898258a50f..f0316cc46dec92629d2546de7c477c29d1d6539d 100644 (file)
--- 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 d6dfa7330e9d809d4e96ca1fd7340e0bcae94c48..8d578f70bac7b94a8cedef634d6ca58557b21047 100644 (file)
--- 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 f4f28ddef999843aa6db8fa8fcdc336481baff33..f394b84f191de03ee8fd4c3dd3e09ec16447e6b7 100644 (file)
--- 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 bd7830abe9eb33384d939102cf6067227905e21b..d5d310d27d648f5c9a9a6a9b41289ee53e63a5b8 100644 (file)
--- 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