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 v2 pve-network 5/9] controllers: extract function that reads network intreaces config
Date: Tue,  2 Apr 2024 18:07:34 +0200	[thread overview]
Message-ID: <20240402160736.519660-8-s.lendl@proxmox.com> (raw)
In-Reply-To: <20240402160736.519660-2-s.lendl@proxmox.com>

read_etc_network_interfaces reads /etc/network/interfaces.
This allows mocking access to local fs.

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>
---
 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.44.0





  parent reply	other threads:[~2024-04-02 16:07 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-02 16:07 [pve-devel] [PATCH v2 pve-network 0/9] SDN: Testing VNets as a blackbox Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 1/9] sdn: extract function that reads datacenter config Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 2/9] dnsmasq: extract function to systemctl command Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 3/9] dnsmasq: extract function that generates the ethers file path Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 4/9] dnsmasq: extract function that updates dnsmasq lease via dbus Stefan Lendl
2024-04-02 16:07 ` Stefan Lendl [this message]
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 6/9] evpn: extract function that reads frr config Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 7/9] api: extract function that creates the sdn directory Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 8/9] tests: test VNets functionality as a blackbox Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 9/9] tests: remove old Vnets tests Stefan Lendl
2024-04-03 11:55 ` [pve-devel] [PATCH v2 pve-network 0/9] SDN: Testing VNets as a blackbox Max Carrara
2024-04-05 13:19 ` 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=20240402160736.519660-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