all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Stefan Lendl <s.lendl@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-network 5/8] refactor(controllers): extract read_etc_network_interfaces
Date: Wed,  3 Jan 2024 16:37:52 +0100	[thread overview]
Message-ID: <20240103153753.407079-8-s.lendl@proxmox.com> (raw)
In-Reply-To: <20240103153753.407079-3-s.lendl@proxmox.com>

to allow 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





  parent reply	other threads:[~2024-01-03 15:45 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-03 15:37 [pve-devel] [PATCH pve-network 0/8] SDN Vnet blackbox testing Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 1/8] refactor(sdn): extract cfs_read_file(datacenter.cfg) Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 2/8] refactor(dnsmasq): extract systemctl_service function Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 3/8] refactor(dnsmasq): extract ethers_file function Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 4/8] refactor(dnsmasq): extract update_lease function Stefan Lendl
2024-01-03 15:37 ` Stefan Lendl [this message]
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 6/8] refactor(evpn): extract read_local_frr_config Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 7/8] refactor(api): extract create_etc_interfaces_sdn_dir Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 8/8] test(vnets): add test_vnets_blackbox Stefan Lendl
2024-03-18 12:41   ` Max Carrara
2024-03-18 14:14     ` Stefan Lendl
2024-03-18 15:00       ` Max Carrara
2024-03-18 12:41 ` [pve-devel] [PATCH pve-network 0/8] SDN Vnet blackbox testing Max Carrara
2024-04-02 16:10   ` 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=20240103153753.407079-8-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.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal