From 9c7dded6e3589878eba4cd67b5a58c5ce3e05c53 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Fri, 11 Feb 2022 10:33:31 +0100 Subject: [PATCH] controllers: evpn : remove ip forwarding, ipv6 forwarding and add frr version Forwarding is enabled by default since frr 7.4 also add frr version && reorder some options to avoid warning message on frr reload Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Controllers/EvpnPlugin.pm | 7 +++---- .../evpn/advertise_subnets/expected_controller_config | 7 +++---- .../disable_arp_nd_suppression/expected_controller_config | 7 +++---- test/zones/evpn/ebgp/expected_controller_config | 7 +++---- test/zones/evpn/ebgp_loopback/expected_controller_config | 7 +++---- test/zones/evpn/exitnode/expected_controller_config | 7 +++---- .../evpn/exitnode_local_routing/expected_controller_config | 7 +++---- .../zones/evpn/exitnode_primary/expected_controller_config | 7 +++---- test/zones/evpn/exitnode_snat/expected_controller_config | 7 +++---- test/zones/evpn/ipv4/expected_controller_config | 7 +++---- test/zones/evpn/ipv4ipv6/expected_controller_config | 7 +++---- .../evpn/ipv4ipv6nogateway/expected_controller_config | 7 +++---- test/zones/evpn/ipv6/expected_controller_config | 7 +++---- test/zones/evpn/multipath_relax/expected_controller_config | 7 +++---- test/zones/evpn/rt_import/expected_controller_config | 7 +++---- 15 files changed, 45 insertions(+), 60 deletions(-) diff --git a/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/PVE/Network/SDN/Controllers/EvpnPlugin.pm index c4aac91..70a9da1 100644 --- a/PVE/Network/SDN/Controllers/EvpnPlugin.pm +++ b/PVE/Network/SDN/Controllers/EvpnPlugin.pm @@ -369,12 +369,11 @@ sub generate_controller_rawconfig { my $nodename = PVE::INotify::nodename(); my $final_config = []; - push @{$final_config}, "log syslog informational"; - push @{$final_config}, "ip forwarding"; - push @{$final_config}, "ipv6 forwarding"; + push @{$final_config}, "frr version 8.0.1"; push @{$final_config}, "frr defaults datacenter"; - push @{$final_config}, "service integrated-vtysh-config"; push @{$final_config}, "hostname $nodename"; + push @{$final_config}, "log syslog informational"; + push @{$final_config}, "service integrated-vtysh-config"; push @{$final_config}, "!"; if (-e "/etc/frr/frr.conf.local") { diff --git a/test/zones/evpn/advertise_subnets/expected_controller_config b/test/zones/evpn/advertise_subnets/expected_controller_config index 73da849..c9545bc 100644 --- a/test/zones/evpn/advertise_subnets/expected_controller_config +++ b/test/zones/evpn/advertise_subnets/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ! vrf vrf_myzone diff --git a/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config b/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config index 4120409..5a8fb99 100644 --- a/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config +++ b/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ! vrf vrf_myzone diff --git a/test/zones/evpn/ebgp/expected_controller_config b/test/zones/evpn/ebgp/expected_controller_config index 50d01c1..5c9a7c6 100644 --- a/test/zones/evpn/ebgp/expected_controller_config +++ b/test/zones/evpn/ebgp/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ! vrf vrf_myzone diff --git a/test/zones/evpn/ebgp_loopback/expected_controller_config b/test/zones/evpn/ebgp_loopback/expected_controller_config index 5b246c6..5ec19a8 100644 --- a/test/zones/evpn/ebgp_loopback/expected_controller_config +++ b/test/zones/evpn/ebgp_loopback/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ip prefix-list loopbacks_ips seq 10 permit 0.0.0.0/0 le 32 ip protocol bgp route-map correct_src diff --git a/test/zones/evpn/exitnode/expected_controller_config b/test/zones/evpn/exitnode/expected_controller_config index 38f358b..96d89f3 100644 --- a/test/zones/evpn/exitnode/expected_controller_config +++ b/test/zones/evpn/exitnode/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ! vrf vrf_myzone diff --git a/test/zones/evpn/exitnode_local_routing/expected_controller_config b/test/zones/evpn/exitnode_local_routing/expected_controller_config index 1968def..812043e 100644 --- a/test/zones/evpn/exitnode_local_routing/expected_controller_config +++ b/test/zones/evpn/exitnode_local_routing/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ip route 10.0.0.0/24 10.255.255.2 xvrf_myzone ! diff --git a/test/zones/evpn/exitnode_primary/expected_controller_config b/test/zones/evpn/exitnode_primary/expected_controller_config index 5306645..5f23bdc 100644 --- a/test/zones/evpn/exitnode_primary/expected_controller_config +++ b/test/zones/evpn/exitnode_primary/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ! vrf vrf_myzone diff --git a/test/zones/evpn/exitnode_snat/expected_controller_config b/test/zones/evpn/exitnode_snat/expected_controller_config index 38f358b..96d89f3 100644 --- a/test/zones/evpn/exitnode_snat/expected_controller_config +++ b/test/zones/evpn/exitnode_snat/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ! vrf vrf_myzone diff --git a/test/zones/evpn/ipv4/expected_controller_config b/test/zones/evpn/ipv4/expected_controller_config index 4120409..5a8fb99 100644 --- a/test/zones/evpn/ipv4/expected_controller_config +++ b/test/zones/evpn/ipv4/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ! vrf vrf_myzone diff --git a/test/zones/evpn/ipv4ipv6/expected_controller_config b/test/zones/evpn/ipv4ipv6/expected_controller_config index 4120409..5a8fb99 100644 --- a/test/zones/evpn/ipv4ipv6/expected_controller_config +++ b/test/zones/evpn/ipv4ipv6/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ! vrf vrf_myzone diff --git a/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config b/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config index 4120409..5a8fb99 100644 --- a/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config +++ b/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ! vrf vrf_myzone diff --git a/test/zones/evpn/ipv6/expected_controller_config b/test/zones/evpn/ipv6/expected_controller_config index 4120409..5a8fb99 100644 --- a/test/zones/evpn/ipv6/expected_controller_config +++ b/test/zones/evpn/ipv6/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ! vrf vrf_myzone diff --git a/test/zones/evpn/multipath_relax/expected_controller_config b/test/zones/evpn/multipath_relax/expected_controller_config index d7f51b1..ec3ce69 100644 --- a/test/zones/evpn/multipath_relax/expected_controller_config +++ b/test/zones/evpn/multipath_relax/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ! vrf vrf_myzone diff --git a/test/zones/evpn/rt_import/expected_controller_config b/test/zones/evpn/rt_import/expected_controller_config index dc15476..bcd2479 100644 --- a/test/zones/evpn/rt_import/expected_controller_config +++ b/test/zones/evpn/rt_import/expected_controller_config @@ -1,9 +1,8 @@ -log syslog informational -ip forwarding -ipv6 forwarding +frr version 8.0.1 frr defaults datacenter -service integrated-vtysh-config hostname localhost +log syslog informational +service integrated-vtysh-config ! ! vrf vrf_myzone -- 2.39.2