public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Gabriel Goller <g.goller@proxmox.com>
To: Hannes Laimer <h.laimer@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [PATCH pve-manager v5 1/1] sdn: add dry-run diff view for sdn apply
Date: Thu, 12 Mar 2026 11:22:38 +0100	[thread overview]
Message-ID: <sdipumutvkknkcfgvhgkp45kwcipmysrwvq5gloakvxpd2hl6m@5ko5eqcpm4ea> (raw)
In-Reply-To: <95393f67-fb49-4d99-962a-4e27fbc82151@proxmox.com>

On 12.03.2026 08:58, Hannes Laimer wrote:
> On 2026-03-10 13:07, Gabriel Goller wrote:
> > Introduce a new SdnDiffView modal that runs a dry-run and shows the frr
> > and ifupdown2 configuration changes which will be made when clicking
> > apply. Now the user knows which config options will be set without
> > needing to apply the config.
> > 
> > Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> > ---
> >  www/manager6/Makefile           |   1 +
> >  www/manager6/sdn/SdnDiffView.js | 149 ++++++++++++++++++++++++++++++++
> >  www/manager6/sdn/StatusView.js  |   8 ++
> >  3 files changed, 158 insertions(+)
> >  create mode 100644 www/manager6/sdn/SdnDiffView.js
> > 
> > diff --git a/www/manager6/sdn/SdnDiffView.js b/www/manager6/sdn/SdnDiffView.js
> > new file mode 100644
> > index 000000000000..e32e4cf896c4
> > --- /dev/null
> > +++ b/www/manager6/sdn/SdnDiffView.js
> > @@ -0,0 +1,149 @@
> > +Ext.define('PVE.sdn.SdnDiffView', {
> > +    extend: 'Ext.window.Window',
> > +
> > [snip]
> > +    loadDiff: async function () {
> > +        let me = this;
> > +
> > +        let req = await Proxmox.Async.api2({
> > +            url: `/cluster/sdn/dry-run`,
> > +            params: { node: me.node },
> > +            method: 'GET',
> > +        });
> > +
> > +        return req.result.data;
> > +    },
> > +
> > +    load: function () {
> > +        let me = this;
> > +
> > +        me.setLoading('fetching node diff');
> > +
> > +        me.loadDiff()
> > +            .catch(Proxmox.Utils.alertResponseFailure)
> 
> I think this should be .then(..).catch(..)

Ack.

> > +            .then((diff) => {
> > +                if (diff['frr-diff'] === null) {
> > +                    this.getViewModel().set('frr_diff', 'no changes');
> > +                } else {
> > +                    this.getViewModel().set('frr_diff', '<pre>' + diff['frr-diff'] + '</pre>');
> 
> we should probably `Ext.htmlEncode(diff['frr-diff'])`, this does
> container user config. The IS-IS controller domain field for example
> allows free-text ...
> 
> ```
> <h1>:P<img src="x"
> onerror="alert(document.cookie.match(/PVEAuthCookie=([^;]+)/)?.[1])"></h1>
> ```
> will work
> 
> > +                }
> > +                if (diff['interfaces-diff'] === null) {
> > +                    this.getViewModel().set('interfaces_diff', 'no changes');
> > +                } else {
> > +                    this.getViewModel().set(
> > +                        'interfaces_diff',
> > +                        '<pre>' + diff['interfaces-diff'] + '</pre>',
> 
> ... here as well

Makes sense, thanks for the review!


> > +                    );
> > +                }
> > +            })
> > +            .finally(() => {
> > +                me.setLoading(false);
> > +            });
> > +    },
> > +
> > +    getNodeSelector: function () {
> > +        let me = this;
> > +
> > +        return Ext.create('PVE.form.NodeSelector', {
> > +            xtype: 'pveNodeSelector',
> > +            reference: 'nodeselector',
> > +            fieldLabel: gettext('Node'),
> > +            padding: 10,
> > +            labelWidth: 120,
> > +            name: 'node',
> > +            allowBlank: false,
> > +            listeners: {
> > +                change: function (f, value) {
> > +                    me.node = value;
> > +                    me.load();
> > +                },
> > +            },
> > +            listConfig: {
> > +                columns: [
> > +                    {
> > +                        header: gettext('Node'),
> > +                        dataIndex: 'node',
> > +                        sortable: true,
> > +                        hideable: false,
> > +                        flex: 1,
> > +                    },
> > +                ],
> > +            },
> > +            store: {
> > +                fields: ['node'],
> > +                proxy: {
> > +                    type: 'proxmox',
> > +                    url: '/api2/json/nodes',
> > +                },
> > +                sorters: [
> > +                    {
> > +                        property: 'node',
> > +                        direction: 'ASC',
> > +                    },
> > +                ],
> > +            },
> > +        });
> > +    },
> > +
> > +    initComponent: function () {
> > +        let me = this;
> > +
> > +        me.nodeSelector = me.getNodeSelector();
> > +
> > +        me.items = [me.nodeSelector, ...me.items];
> > +
> > +        me.callParent();
> > +    },
> > +});
> > diff --git a/www/manager6/sdn/StatusView.js b/www/manager6/sdn/StatusView.js
> > index fbc712c6cf6b..fada50411e91 100644
> > --- a/www/manager6/sdn/StatusView.js
> > +++ b/www/manager6/sdn/StatusView.js
> > @@ -69,6 +69,14 @@ Ext.define(
> >                              });
> >                          },
> >                      },
> > +                    {
> > +                        text: gettext('Dry-Run'),
> > +                        handler: function () {
> > +                            Ext.create('PVE.sdn.SdnDiffView', {
> > +                                autoShow: true,
> > +                            });
> > +                        },
> > +                    },
> >                  ],
> >                  viewConfig: {
> >                      trackOver: false,
> 




  reply	other threads:[~2026-03-12 10:22 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-10 12:06 [PATCH manager/network/proxmox{-ve-rs,-perl-rs} v5 00/19] Generate frr config using jinja templates and rust types Gabriel Goller
2026-03-10 12:06 ` [PATCH proxmox-ve-rs v5 1/8] ve-config: firewall: cargo fmt Gabriel Goller
2026-03-10 12:06 ` [PATCH proxmox-ve-rs v5 2/8] frr: add proxmox-frr-templates package that contains templates Gabriel Goller
2026-03-12  8:01   ` Hannes Laimer
2026-03-12 10:03     ` Gabriel Goller
2026-03-12  8:19   ` Hannes Laimer
2026-03-12  9:30     ` Gabriel Goller
2026-03-12  8:33   ` Hannes Laimer
2026-03-12  9:31     ` Gabriel Goller
2026-03-10 12:06 ` [PATCH proxmox-ve-rs v5 3/8] ve-config: remove FrrConfigBuilder struct Gabriel Goller
2026-03-10 12:06 ` [PATCH proxmox-ve-rs v5 4/8] sdn-types: support variable-length NET identifier Gabriel Goller
2026-03-10 12:06 ` [PATCH proxmox-ve-rs v5 5/8] frr: add template serializer and serialize fabrics using templates Gabriel Goller
2026-03-12  8:44   ` Hannes Laimer
2026-03-12 10:07     ` Gabriel Goller
2026-03-12  9:12   ` Hannes Laimer
2026-03-12 10:11     ` Gabriel Goller
2026-03-10 12:06 ` [PATCH proxmox-ve-rs v5 6/8] frr: add isis configuration and templates Gabriel Goller
2026-03-10 12:06 ` [PATCH proxmox-ve-rs v5 7/8] frr: support custom frr configuration lines Gabriel Goller
2026-03-10 12:06 ` [PATCH proxmox-ve-rs v5 8/8] frr: add bgp support with templates and serialization Gabriel Goller
2026-03-12  8:30   ` Hannes Laimer
2026-03-12  9:35     ` Gabriel Goller
2026-03-10 12:06 ` [PATCH proxmox-perl-rs v5 1/1] sdn: add function to generate the frr config for all daemons Gabriel Goller
2026-03-10 12:06 ` [PATCH pve-network v5 1/9] tests: use Test::Differences to make test assertions Gabriel Goller
2026-03-10 12:06 ` [PATCH pve-network v5 2/9] test: add tests for frr.conf.local merging Gabriel Goller
2026-03-10 12:06 ` [PATCH pve-network v5 3/9] test: bgp: add some various integration tests Gabriel Goller
2026-03-10 12:06 ` [PATCH pve-network v5 4/9] sdn: write structured frr config that can be rendered using templates Gabriel Goller
2026-03-12  9:20   ` Hannes Laimer
2026-03-12 10:20     ` Gabriel Goller
2026-03-10 12:06 ` [PATCH pve-network v5 5/9] sdn: remove duplicate comment line '!' in frr config Gabriel Goller
2026-03-10 12:06 ` [PATCH pve-network v5 6/9] tests: rearrange some statements in the " Gabriel Goller
2026-03-10 12:06 ` [PATCH pve-network v5 7/9] sdn: adjust frr.conf.local merging to rust template types Gabriel Goller
2026-03-10 12:06 ` [PATCH pve-network v5 8/9] test: adjust frr_local_merge test for new template generation Gabriel Goller
2026-03-10 12:06 ` [PATCH pve-network v5 9/9] api: add dry-run endpoint for sdn apply to preview changes Gabriel Goller
2026-03-10 12:06 ` [PATCH pve-manager v5 1/1] sdn: add dry-run diff view for sdn apply Gabriel Goller
2026-03-12  7:58   ` Hannes Laimer
2026-03-12 10:22     ` Gabriel Goller [this message]
2026-03-11 17:22 ` [PATCH manager/network/proxmox{-ve-rs,-perl-rs} v5 00/19] Generate frr config using jinja templates and rust types Stefan Hanreich
2026-03-12 13:35 ` Hannes Laimer
2026-03-12 14:28 ` Gabriel Goller
2026-03-12 14:31 ` 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=sdipumutvkknkcfgvhgkp45kwcipmysrwvq5gloakvxpd2hl6m@5ko5eqcpm4ea \
    --to=g.goller@proxmox.com \
    --cc=h.laimer@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