From: Stefan Lendl <s.lendl@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-network 1/4] refactor(controllers): extract read_etc_network_interfaces
Date: Tue, 5 Dec 2023 14:12:07 +0100 [thread overview]
Message-ID: <20231205131209.1813439-3-s.lendl@proxmox.com> (raw)
In-Reply-To: <20231205131209.1813439-2-s.lendl@proxmox.com>
Allows mocking local fs access
Signed-off-by: Stefan Lendl <s.lendl@proxmox.com>
---
src/PVE/Network/SDN/Controllers.pm | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/PVE/Network/SDN/Controllers.pm b/src/PVE/Network/SDN/Controllers.pm
index 167d3ea..fd7ad54 100644
--- a/src/PVE/Network/SDN/Controllers.pm
+++ b/src/PVE/Network/SDN/Controllers.pm
@@ -70,6 +70,16 @@ sub complete_sdn_controller {
return $cmdname eq 'add' ? [] : [ PVE::Network::SDN::sdn_controllers_ids($cfg) ];
}
+sub read_etc_network_interfaces {
+ # read main config for physical interfaces
+ my $current_config_file = "/etc/network/interfaces";
+ my $fh = IO::File->new($current_config_file) or die "failed to open $current_config_file - $!\n";
+ my $interfaces_config = PVE::INotify::read_etc_network_interfaces($current_config_file, $fh);
+ $fh->close();
+
+ return $interfaces_config;
+}
+
sub generate_controller_config {
my $cfg = PVE::Network::SDN::running_config();
@@ -79,11 +89,7 @@ sub generate_controller_config {
return if !$vnet_cfg && !$zone_cfg && !$controller_cfg;
- # read main config for physical interfaces
- my $current_config_file = "/etc/network/interfaces";
- my $fh = IO::File->new($current_config_file) or die "failed to open $current_config_file - $!\n";
- my $interfaces_config = PVE::INotify::read_etc_network_interfaces($current_config_file, $fh);
- $fh->close();
+ my $interfaces_config = read_etc_network_interfaces();
# check uplinks
my $uplinks = {};
--
2.42.0
next prev parent reply other threads:[~2023-12-05 13:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-05 13:12 [pve-devel] [PATCH pve-network 0/4] SDN tests in sbuild Stefan Lendl
2023-12-05 13:12 ` Stefan Lendl [this message]
2023-12-05 13:12 ` [pve-devel] [PATCH pve-network 2/4] refactor(evpn): extract read_local_frr_config Stefan Lendl
2023-12-05 13:12 ` [pve-devel] [PATCH pve-network 3/4] tests: mocking more functions to avoid access to system files Stefan Lendl
2023-12-05 13:18 ` Lukas Wagner
2023-12-05 14:55 ` Stefan Lendl
2023-12-05 13:12 ` [pve-devel] [PATCH pve-network 4/4] tests: run tests in sbuild Stefan Lendl
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=20231205131209.1813439-3-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.