From: Stefan Lendl <s.lendl@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v3 pve-network 05/12] sdn: zones: extract function that reads datacenter config
Date: Fri, 5 Apr 2024 15:17:58 +0200 [thread overview]
Message-ID: <20240405131806.388178-6-s.lendl@proxmox.com> (raw)
In-Reply-To: <20240405131806.388178-1-s.lendl@proxmox.com>
The datacenter_config() functions in SDN::Zones::Plugin is a simple
wrapper that reads datacenter.cfg via cfs.
This allows mocking datacenter.cfg in tests.
Signed-off-by: Stefan Lendl <s.lendl@proxmox.com>
Reviewed-by: Max Carrara <m.carrara@proxmox.com>
Tested-by: Max Carrara <m.carrara@proxmox.com>
Reviewed-by: Stefan Hanreich <s.hanreich@proxmox.com>
Tested-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
src/PVE/Network/SDN/Zones/EvpnPlugin.pm | 3 ++-
src/PVE/Network/SDN/Zones/Plugin.pm | 5 +++++
src/PVE/Network/SDN/Zones/SimplePlugin.pm | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/PVE/Network/SDN/Zones/EvpnPlugin.pm b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm
index 655a9f0..4843756 100644
--- a/src/PVE/Network/SDN/Zones/EvpnPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm
@@ -3,6 +3,7 @@ package PVE::Network::SDN::Zones::EvpnPlugin;
use strict;
use warnings;
use PVE::Network::SDN::Zones::VxlanPlugin;
+use PVE::Network::SDN::Zones::Plugin;
use PVE::Exception qw(raise raise_param_exc);
use PVE::JSONSchema qw(get_standard_option);
use PVE::Tools qw($IPV4RE);
@@ -294,7 +295,7 @@ sub on_update_hook {
}
if (!defined($zone_cfg->{ids}->{$zoneid}->{'mac'})) {
- my $dc = PVE::Cluster::cfs_read_file('datacenter.cfg');
+ my $dc = PVE::Network::SDN::Zones::Plugin->datacenter_config();
$zone_cfg->{ids}->{$zoneid}->{'mac'} = PVE::Tools::random_ether_addr($dc->{mac_prefix});
}
}
diff --git a/src/PVE/Network/SDN/Zones/Plugin.pm b/src/PVE/Network/SDN/Zones/Plugin.pm
index b55b967..247d0b2 100644
--- a/src/PVE/Network/SDN/Zones/Plugin.pm
+++ b/src/PVE/Network/SDN/Zones/Plugin.pm
@@ -356,4 +356,9 @@ sub get_bridge_ifaces {
return @bridge_ifaces;
}
+
+sub datacenter_config {
+ return PVE::Cluster::cfs_read_file('datacenter.cfg');
+}
+
1;
diff --git a/src/PVE/Network/SDN/Zones/SimplePlugin.pm b/src/PVE/Network/SDN/Zones/SimplePlugin.pm
index c996bf3..65e9ad4 100644
--- a/src/PVE/Network/SDN/Zones/SimplePlugin.pm
+++ b/src/PVE/Network/SDN/Zones/SimplePlugin.pm
@@ -139,7 +139,7 @@ sub vnet_update_hook {
raise_param_exc({ tag => "vlan tag is not allowed on simple zone"}) if defined($tag);
if (!defined($vnet->{mac})) {
- my $dc = PVE::Cluster::cfs_read_file('datacenter.cfg');
+ my $dc = PVE::Network::SDN::Zones::Plugin::datacenter_config();
$vnet->{mac} = PVE::Tools::random_ether_addr($dc->{mac_prefix});
}
}
--
2.44.0
next prev parent reply other threads:[~2024-04-05 13:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 13:17 [pve-devel] [PATCH v3 pve-network 00/12] SDN: Testing VNets as a blackbox and fixing found bugs Stefan Lendl
2024-04-05 13:17 ` [pve-devel] [PATCH v3 pve-network 01/12] sdn: dhcp: get next free ip for a specific IP version Stefan Lendl
2024-04-05 13:17 ` [pve-devel] [PATCH v3 pve-network 02/12] sdn: dhcp: request both IPv4 and IPv6 addresses on VM start Stefan Lendl
2024-04-05 13:17 ` [pve-devel] [PATCH v3 pve-network 03/12] sdn: dhcp: only consider subnets that have dhcp-range configured Stefan Lendl
2024-04-05 13:17 ` [pve-devel] [PATCH v3 pve-network 04/12] sdn: dhcp: rollback allocated ips on failure Stefan Lendl
2024-04-05 13:17 ` Stefan Lendl [this message]
2024-04-05 13:17 ` [pve-devel] [PATCH v3 pve-network 06/12] dns: dnsmasq: extract function to systemctl command Stefan Lendl
2024-04-05 13:18 ` [pve-devel] [PATCH v3 pve-network 07/12] sdn: dnsmasq: extract function that generates the ethers file path Stefan Lendl
2024-04-05 13:18 ` [pve-devel] [PATCH v3 pve-network 08/12] sdn: dnsmasq: extract function that updates dnsmasq lease via dbus Stefan Lendl
2024-04-05 13:18 ` [pve-devel] [PATCH v3 pve-network 09/12] sdn: api: extract function that creates the sdn directory Stefan Lendl
2024-04-05 13:18 ` [pve-devel] [PATCH v3 pve-network 10/12] debian: blackbox tests depend on libpve-access-control at build Stefan Lendl
2024-04-05 13:18 ` [pve-devel] [PATCH v3 pve-network 11/12] tests: test VNets functionality as a blackbox Stefan Lendl
2024-04-05 13:18 ` [pve-devel] [PATCH v3 pve-network 12/12] tests: remove old Vnets tests Stefan Lendl
2024-04-08 12:02 ` [pve-devel] [PATCH v3 pve-network 00/12] SDN: Testing VNets as a blackbox and fixing found bugs Stefan Hanreich
2024-04-08 15:59 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240405131806.388178-6-s.lendl@proxmox.com \
--to=s.lendl@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox