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 57EEE60804 for ; Thu, 3 Dec 2020 10:20:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4F1FD25463 for ; Thu, 3 Dec 2020 10:19:54 +0100 (CET) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 928FA25431 for ; Thu, 3 Dec 2020 10:19:52 +0100 (CET) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 4543813024F; Thu, 3 Dec 2020 10:19:45 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 3 Dec 2020 10:19:40 +0100 Message-Id: <20201203091942.2401958-6-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201203091942.2401958-1-aderumier@odiso.com> References: <20201203091942.2401958-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.213 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.25 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 KHOP_HELO_FCRDNS 0.399 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [evpnplugin.pm] Subject: [pve-devel] [PATCH V2 pve-network 5/7] zones: evpn: fix exitnodes for snat 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: Thu, 03 Dec 2020 09:20:24 -0000 Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Controllers/EvpnPlugin.pm | 3 ++- PVE/Network/SDN/Zones/EvpnPlugin.pm | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/PVE/Network/SDN/Controllers/EvpnPlugin.pm index b997cca..6927921 100644 --- a/PVE/Network/SDN/Controllers/EvpnPlugin.pm +++ b/PVE/Network/SDN/Controllers/EvpnPlugin.pm @@ -144,7 +144,8 @@ sub generate_controller_zone_config { push(@{$config->{frr}->{router}->{"bgp $asn vrf $vrf"}->{"address-family"}->{"l2vpn evpn"}}, "route-target export $autortas:$vrfvxlan"); } - my $is_gateway = grep { $_ eq $local_node } PVE::Tools::split_list($exitnodes); + my $is_gateway = $exitnodes->{$local_node}; + if ($is_gateway) { @controller_config = (); diff --git a/PVE/Network/SDN/Zones/EvpnPlugin.pm b/PVE/Network/SDN/Zones/EvpnPlugin.pm index d833641..e6ee839 100644 --- a/PVE/Network/SDN/Zones/EvpnPlugin.pm +++ b/PVE/Network/SDN/Zones/EvpnPlugin.pm @@ -100,12 +100,11 @@ sub generate_sdn_config { push @iface_config, "address $gateway/$mask" if !defined($address->{$gateway}); $address->{$gateway} = 1; } + if ($subnet->{snat}) { - my $gatewaynodes = $controller->{'gateway-nodes'}; - my $is_evpn_gateway = ""; - foreach my $evpn_gatewaynode (PVE::Tools::split_list($gatewaynodes)) { - $is_evpn_gateway = 1 if $evpn_gatewaynode eq $local_node; - } + + my $is_evpn_gateway = $plugin_config->{'exitnodes'}->{$local_node}; + #find outgoing interface my ($outip, $outiface) = PVE::Network::SDN::Zones::Plugin::get_local_route_ip('8.8.8.8'); if ($outip && $outiface && $is_evpn_gateway) { -- 2.20.1