all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: "Max Carrara" <m.carrara@proxmox.com>
To: "Proxmox VE development discussion" <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH v2 pve-network 1/5] refactor(controllers): extract read_etc_network_interfaces
Date: Mon, 25 Mar 2024 14:19:56 +0100	[thread overview]
Message-ID: <D02V0X3ZSQLV.2ADYTDPJKK8MM@proxmox.com> (raw)
In-Reply-To: <20240307151319.301984-3-s.lendl@proxmox.com>

Should just be "controllers: [...]" as per our commit guidelines [0],
but this can honestly be changed while applying.

Otherwise LGTM!

[0]: https://pve.proxmox.com/wiki/Developer_Documentation#Commits_and_Commit_Messages

On Thu Mar 7, 2024 at 4:13 PM CET, Stefan Lendl wrote:
> 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 = {};





  reply	other threads:[~2024-03-25 13:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-07 15:13 [pve-devel] [PATCH v2 pve-network 0/5] SDN tests in sbuild Stefan Lendl
2024-03-07 15:13 ` [pve-devel] [PATCH v2 pve-network 1/5] refactor(controllers): extract read_etc_network_interfaces Stefan Lendl
2024-03-25 13:19   ` Max Carrara [this message]
2024-03-07 15:13 ` [pve-devel] [PATCH v2 pve-network 2/5] refactor(evpn): extract read_local_frr_config Stefan Lendl
2024-03-25 13:20   ` Max Carrara
2024-03-07 15:13 ` [pve-devel] [PATCH v2 pve-network 3/5] tests: mocking more functions to avoid system access Stefan Lendl
2024-03-25 13:21   ` Max Carrara
2024-03-07 15:13 ` [pve-devel] [PATCH v2 pve-network 4/5] tests: disable failing DNS tests Stefan Lendl
2024-03-25 13:21   ` Max Carrara
2024-03-07 15:13 ` [pve-devel] [PATCH v2 pve-network 5/5] tests: run tests in sbuild Stefan Lendl
2024-03-25 13:24 ` [pve-devel] [PATCH v2 pve-network 0/5] SDN " Max Carrara
2024-04-02 11: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=D02V0X3ZSQLV.2ADYTDPJKK8MM@proxmox.com \
    --to=m.carrara@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