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 C9A84BB7E4 for ; Mon, 18 Dec 2023 14:04:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A536C1B7C0 for ; Mon, 18 Dec 2023 14:04:45 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 18 Dec 2023 14:04:44 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 90CC580FA; Mon, 18 Dec 2023 14:04:33 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 7F7EF1378DF; Mon, 18 Dec 2023 14:04:33 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 18 Dec 2023 14:04:29 +0100 Message-Id: <20231218130431.1857324-2-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231218130431.1857324-1-aderumier@odiso.com> References: <20231218130431.1857324-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [dhcp.pm, evpnplugin.pm, zones.pm, plugin.pm, dnsmasq.pm] Subject: [pve-devel] [PATCH pve-network 1/3] dhcp: add vrf support 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: Mon, 18 Dec 2023 13:04:45 -0000 launch dnsmasq in a vrf context with "ip vrf exec dnsmasq.." use "default" vrf if plugin don't return a specific vrf Signed-off-by: Alexandre Derumier --- src/PVE/Network/SDN/Dhcp.pm | 3 ++- src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 3 ++- src/PVE/Network/SDN/Zones.pm | 10 ++++++++++ src/PVE/Network/SDN/Zones/EvpnPlugin.pm | 6 ++++++ src/PVE/Network/SDN/Zones/Plugin.pm | 6 ++++++ 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/PVE/Network/SDN/Dhcp.pm b/src/PVE/Network/SDN/Dhcp.pm index 7876c08..7b5e31f 100644 --- a/src/PVE/Network/SDN/Dhcp.pm +++ b/src/PVE/Network/SDN/Dhcp.pm @@ -79,12 +79,13 @@ sub regenerate_config { my $zone = $zone_cfg->{ids}->{$zoneid}; next if !$zone->{dhcp}; + my $vrf = PVE::Network::SDN::Zones::get_vrf($zoneid); my $dhcp_plugin_name = $zone->{dhcp}; my $dhcp_plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($dhcp_plugin_name); die "Could not find DHCP plugin: $dhcp_plugin_name" if !$dhcp_plugin; - eval { $dhcp_plugin->before_configure($zoneid) }; + eval { $dhcp_plugin->before_configure($zoneid, $vrf) }; die "Could not run before_configure for DHCP server $zoneid $@\n" if $@; for my $vnetid (sort keys %{$vnet_cfg->{ids}}) { diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm index 2844943..755bc0b 100644 --- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm +++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm @@ -164,7 +164,7 @@ sub configure_vnet { } sub before_configure { - my ($class, $dhcpid) = @_; + my ($class, $dhcpid, $vrf) = @_; my $dbus_config = <{ids}->{$zoneid}; + + my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type}); + return $plugin->get_vrf($plugin_config, $zoneid); +} + sub generate_etc_network_config { my $cfg = PVE::Network::SDN::running_config(); diff --git a/src/PVE/Network/SDN/Zones/EvpnPlugin.pm b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm index 655a9f0..561d127 100644 --- a/src/PVE/Network/SDN/Zones/EvpnPlugin.pm +++ b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm @@ -272,6 +272,12 @@ sub generate_sdn_config { return $config; } +sub get_vrf { + my ($class, $plugin_config, $zoneid) = @_; + + return "vrf_$zoneid"; +} + sub on_update_hook { my ($class, $zoneid, $zone_cfg, $controller_cfg) = @_; diff --git a/src/PVE/Network/SDN/Zones/Plugin.pm b/src/PVE/Network/SDN/Zones/Plugin.pm index 69a6e5a..ee7bbb2 100644 --- a/src/PVE/Network/SDN/Zones/Plugin.pm +++ b/src/PVE/Network/SDN/Zones/Plugin.pm @@ -140,6 +140,12 @@ sub controller_reload { die "please implement inside plugin"; } +sub get_vrf { + my ($class, $plugin_config, $zoneid) = @_; + + return 'default'; +} + sub on_delete_hook { my ($class, $zoneid, $vnet_cfg) = @_; -- 2.39.2