public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Hannes Laimer <h.laimer@proxmox.com>
To: Gabriel Goller <g.goller@proxmox.com>, pve-devel@lists.proxmox.com
Subject: Re: [PATCH pve-network v4 9/9] api: add dry-run endpoint for sdn apply to preview changes
Date: Fri, 6 Mar 2026 18:13:40 +0100	[thread overview]
Message-ID: <d49a00d4-d736-4f14-bf9d-f045b5cbc83c@proxmox.com> (raw)
In-Reply-To: <20260306125315.190298-19-g.goller@proxmox.com>

nit inline

On 2026-03-06 13:54, Gabriel Goller wrote:
> Allows users to see the diff of frr and interfaces configuration files
> before applying SDN changes. Previously this was not possible and the
> user had to apply and then see what changed. For the ifupdown2 dry-run
> to work, pull out the running_config generation to the parent functions.
> 
> Also add an option to the compile_running_cfg function so that we can
> skip the /etc/network/interfaces.d/sdn file version bump. This means
> when nothing has been changed and dry-run is pressed, nothing will be
> shown.
> 
> Rename a few constants so that they don't clash with local variables.
> 
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> ---
>  src/PVE/API2/Network/SDN.pm      | 88 ++++++++++++++++++++++++++++++++
>  src/PVE/Network/SDN.pm           | 36 ++++++++-----
>  src/PVE/Network/SDN/Fabrics.pm   | 10 +++-
>  src/PVE/Network/SDN/Zones.pm     |  3 +-
>  src/test/debug/generateconfig.pl |  3 +-
>  src/test/run_test_zones.pl       |  2 +-
>  6 files changed, 124 insertions(+), 18 deletions(-)
> 
> diff --git a/src/PVE/API2/Network/SDN.pm b/src/PVE/API2/Network/SDN.pm
> index b35a588d391d..b98bc9146004 100644
> --- a/src/PVE/API2/Network/SDN.pm
> +++ b/src/PVE/API2/Network/SDN.pm
> @@ -3,6 +3,9 @@ package PVE::API2::Network::SDN;
>  use strict;
>  use warnings;
>  

[..]

> +
> +__PACKAGE__->register_method({
> +    name => 'dry-run',
> +    path => 'dry-run',
> +    method => 'GET',
> +    permissions => {
> +        check => ['perm', '/nodes/{node}', ['Sys.Modify']],

very much a nit, and doesn't warrant a v5, but Sys.Audit is probably
more fitting

> +    },
> +    description =>
> +        "Dry-run the SDN apply action and return the difference between the current configuration and the pending configuration",
> +    protected => 1,
> +    proxyto => 'node',
> +    parameters => {
> +        additionalProperties => 0,
> +        properties => {
> +            node => get_standard_option('pve-node'),
> +        },
> +    },
> +
> +    returns => {
> +        type => 'object',
> +        properties => {
> +            "frr-diff" => {
> +                type => 'string',
> +                description =>
> +                    'The difference between the current and pending FRR configuration.',
> +            },
> +            "interfaces-diff" => {
> +                type => 'string',
> +                description =>
> +                    'The difference between the current and pending /etc/network/interfaces.d/sdn configuration.',
> +            },
> +        },
> +    },

[..]

>  
>  PVE::Network::SDN::Zones::write_etc_network_config($network_config);
>  print "/etc/network/interfaces.d/sdn\n";
> diff --git a/src/test/run_test_zones.pl b/src/test/run_test_zones.pl
> index 806225735e6b..8986c5c52c9f 100755
> --- a/src/test/run_test_zones.pl
> +++ b/src/test/run_test_zones.pl
> @@ -145,7 +145,7 @@ foreach my $test (@tests) {
>      my $name = $test;
>      my $expected = read_file("./$test/expected_sdn_interfaces");
>  
> -    my $result = eval { PVE::Network::SDN::generate_raw_etc_network_config() };
> +    my $result = eval { PVE::Network::SDN::generate_raw_etc_network_config($sdn_config) };
>  
>      if (my $err = $@) {
>          diag("got unexpected error - $err");





  reply	other threads:[~2026-03-06 17:13 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-06 12:52 [PATCH manager/network/proxmox{-ve-rs,-perl-rs} v4 00/19] Generate frr config using jinja templates and rust types Gabriel Goller
2026-03-06 12:52 ` [PATCH proxmox-ve-rs v4 1/8] ve-config: firewall: cargo fmt Gabriel Goller
2026-03-06 12:52 ` [PATCH proxmox-ve-rs v4 2/8] frr: add proxmox-frr-templates package that contains templates Gabriel Goller
2026-03-06 12:52 ` [PATCH proxmox-ve-rs v4 3/8] ve-config: remove FrrConfigBuilder struct Gabriel Goller
2026-03-06 12:52 ` [PATCH proxmox-ve-rs v4 4/8] sdn-types: support variable-length NET identifier Gabriel Goller
2026-03-06 12:52 ` [PATCH proxmox-ve-rs v4 5/8] frr: add template serializer and serialize fabrics using templates Gabriel Goller
2026-03-06 12:53 ` [PATCH proxmox-ve-rs v4 6/8] frr: add isis configuration and templates Gabriel Goller
2026-03-06 12:53 ` [PATCH proxmox-ve-rs v4 7/8] frr: support custom frr configuration lines Gabriel Goller
2026-03-06 12:53 ` [PATCH proxmox-ve-rs v4 8/8] frr: add bgp support with templates and serialization Gabriel Goller
2026-03-06 12:53 ` [PATCH proxmox-perl-rs v4 1/1] sdn: add function to generate the frr config for all daemons Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 1/9] tests: use Test::Differences to make test assertions Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 2/9] test: add tests for frr.conf.local merging Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 3/9] test: bgp: add some various integration tests Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 4/9] sdn: write structured frr config that can be rendered using templates Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 5/9] sdn: remove duplicate comment line '!' in frr config Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 6/9] tests: rearrange some statements in the " Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 7/9] sdn: adjust frr.conf.local merging to rust template types Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 8/9] test: adjust frr_local_merge test for new template generation Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 9/9] api: add dry-run endpoint for sdn apply to preview changes Gabriel Goller
2026-03-06 17:13   ` Hannes Laimer [this message]
2026-03-09 12:24     ` Gabriel Goller
2026-03-09 15:48   ` Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-manager v4 1/1] sdn: add dry-run diff view for sdn apply Gabriel Goller
2026-03-10 12:10 ` [PATCH manager/network/proxmox{-ve-rs,-perl-rs} v4 00/19] Generate frr config using jinja templates and rust types Gabriel Goller

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=d49a00d4-d736-4f14-bf9d-f045b5cbc83c@proxmox.com \
    --to=h.laimer@proxmox.com \
    --cc=g.goller@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal