[pve-devel] [PATCH pve-network 1/7] dhcp: add vrf support

[Alexandre Derumier]

launch dnsmasq in a vrf context with "ip vrf exec <vrfname> dnsmasq.."

use "default" vrf if plugin don't return a specific vrf

Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 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 |  8 ++++++++
 src/PVE/Network/SDN/Zones/Plugin.pm     |  7 +++++++
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/PVE/Network/SDN/Dhcp.pm b/src/PVE/Network/SDN/Dhcp.pm
index 7876c08..ce72c4d 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 $options = PVE::Network::SDN::Zones::get_options($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, $options) };
 	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..169ce56 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, $options) = @_;
 
     my $dbus_config = <<DBUSCFG;
 <!DOCTYPE busconfig PUBLIC
@@ -198,6 +198,7 @@ DBUSCFG
     my $default_config = <<CFG;
 CONFIG_DIR='$config_directory,\*.conf'
 DNSMASQ_OPTS="--conf-file=/dev/null --enable-dbus=uk.org.thekelleys.dnsmasq.$dhcpid"
+VRF='$options->{vrf}'
 CFG
 
     PVE::Tools::file_set_contents(
diff --git a/src/PVE/Network/SDN/Zones.pm b/src/PVE/Network/SDN/Zones.pm
index 5bd3536..fd4e73d 100644
--- a/src/PVE/Network/SDN/Zones.pm
+++ b/src/PVE/Network/SDN/Zones.pm
@@ -104,6 +104,16 @@ sub get_vnets {
     return $vnets;
 }
 
+sub get_options {
+    my ($zoneid) = @_;
+
+    my $zone_cfg = PVE::Network::SDN::Zones::config();
+    my $plugin_config = $zone_cfg->{ids}->{$zoneid};
+
+    my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type});
+    return $plugin->get_options($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..c806564 100644
--- a/src/PVE/Network/SDN/Zones/EvpnPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm
@@ -272,6 +272,14 @@ sub generate_sdn_config {
     return $config;
 }
 
+sub get_options {
+    my ($class, $plugin_config, $zoneid) = @_;
+
+    my $options = { vrf => "vrf_$zoneid"};
+
+    return $options;
+}
+
 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 b55b967..07e8389 100644
--- a/src/PVE/Network/SDN/Zones/Plugin.pm
+++ b/src/PVE/Network/SDN/Zones/Plugin.pm
@@ -129,6 +129,13 @@ sub controller_reload {
     die "please implement inside plugin";
 }
 
+sub get_options {
+    my ($class, $plugin_config, $zoneid) = @_;
+
+    my $options = { vrf => 'default'};
+    return $options;
+}
+
 sub on_delete_hook {
     my ($class, $zoneid, $vnet_cfg) = @_;
 
-- 
2.39.2