From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id AFAF8620FC for ; Fri, 11 Feb 2022 10:33:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F1D3826793 for ; Fri, 11 Feb 2022 10:33:49 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 02F6426654 for ; Fri, 11 Feb 2022 10:33:41 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 35EDB16ACC1; Fri, 11 Feb 2022 10:33:34 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 2CF061295D1; Fri, 11 Feb 2022 10:33:34 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Fri, 11 Feb 2022 10:33:31 +0100 Message-Id: <20220211093331.609127-11-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220211093331.609127-1-aderumier@odiso.com> References: <20220211093331.609127-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.001 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.248 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-network 10/10] controllers: evpn : remove ip forwarding, ipv6 forwarding and add frr version X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2022 09:33:50 -0000 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.30.2