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 2/5] refactor(evpn): extract read_local_frr_config
Date: Mon, 25 Mar 2024 14:20:17 +0100 [thread overview]
Message-ID: <D02V16NPE9U6.18T103KQBBESZ@proxmox.com> (raw)
In-Reply-To: <20240307151319.301984-4-s.lendl@proxmox.com>
Should just be "evpn: [...]" 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/EvpnPlugin.pm | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
> index c2fdf88..836a689 100644
> --- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
> +++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
> @@ -487,6 +487,12 @@ sub generate_frr_list {
> }
> }
>
> +sub read_local_frr_config {
> + if (-e "/etc/frr/frr.conf.local") {
> + return file_get_contents("/etc/frr/frr.conf.local");
> + }
> +};
> +
> sub generate_controller_rawconfig {
> my ($class, $plugin_config, $config) = @_;
>
> @@ -500,8 +506,8 @@ sub generate_controller_rawconfig {
> push @{$final_config}, "service integrated-vtysh-config";
> push @{$final_config}, "!";
>
> - if (-e "/etc/frr/frr.conf.local") {
> - my $local_conf = file_get_contents("/etc/frr/frr.conf.local");
> + my $local_conf = read_local_frr_config();
> + if ($local_conf) {
> parse_merge_frr_local_config($config, $local_conf);
> }
>
next prev parent reply other threads:[~2024-03-25 13:20 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
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 [this message]
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=D02V16NPE9U6.18T103KQBBESZ@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox