From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id B739E1FF137 for ; Tue, 31 Mar 2026 10:38:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7CF2C13C5A; Tue, 31 Mar 2026 10:38:54 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Subject: [PATCH manager] sdn: add dry-run diff view for sdn apply Date: Tue, 31 Mar 2026 10:38:38 +0200 Message-ID: <20260331083845.53881-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774946274576 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.025 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 5FOQCZ7H5Q26677OGJYQ72WKN5MV6C2D X-Message-ID-Hash: 5FOQCZ7H5Q26677OGJYQ72WKN5MV6C2D X-MailFrom: g.goller@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Thomas Lamprecht X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 having to apply the config. Co-authored-by: Thomas Lamprecht Signed-off-by: Gabriel Goller --- This was a part of the template series: https://lore.proxmox.com/pve-devel/20260327150127.545193-1-g.goller@proxmox.com/ www/manager6/Makefile | 1 + www/manager6/sdn/SdnDiffView.js | 114 ++++++++++++++++++++++++++++++++ www/manager6/sdn/StatusView.js | 8 +++ 3 files changed, 123 insertions(+) create mode 100644 www/manager6/sdn/SdnDiffView.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 4558d53e54be..da602523b27a 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -286,6 +286,7 @@ JSSRC= \ sdn/ControllerView.js \ sdn/Status.js \ sdn/StatusView.js \ + sdn/SdnDiffView.js \ sdn/VnetEdit.js \ sdn/VnetView.js \ sdn/VnetACLView.js \ diff --git a/www/manager6/sdn/SdnDiffView.js b/www/manager6/sdn/SdnDiffView.js new file mode 100644 index 000000000000..2bc52049585f --- /dev/null +++ b/www/manager6/sdn/SdnDiffView.js @@ -0,0 +1,114 @@ +Ext.define('PVE.sdn.SdnDiffView', { + extend: 'Ext.window.Window', + + width: 800, + height: 900, + + modal: true, + title: gettext('Pending SDN configuration changes'), + + layout: { + type: 'vbox', + align: 'stretch', + }, + + viewModel: { + data: { + node: undefined, + frr_diff: '', + interfaces_diff: '', + }, + }, + + controller: { + xclass: 'Ext.app.ViewController', + + nodeChange: function (_field, value) { + let me = this; + let vm = me.getViewModel(); + let view = me.getView(); + + vm.set('node', value); + view.setLoading(gettext('Fetching diff...')); + + Proxmox.Async.api2({ + url: '/cluster/sdn/dry-run', + params: { node: value }, + method: 'GET', + }) + .then((req) => { + let diff = req.result.data; + + vm.set('frr_diff', Ext.htmlEncode(diff['frr-diff'] ?? gettext('No changes'))); + vm.set( + 'interfaces_diff', + Ext.htmlEncode(diff['interfaces-diff'] ?? gettext('No changes')), + ); + }) + .catch(Proxmox.Utils.alertResponseFailure) + .finally(() => { + view.setLoading(false); + }); + }, + }, + + items: [ + { + xtype: 'pveNodeSelector', + fieldLabel: gettext('Node'), + padding: 10, + labelWidth: 120, + name: 'node', + allowBlank: false, + listeners: { + change: 'nodeChange', + }, + }, + { + xtype: 'panel', + title: gettext('FRR Config'), + flex: 1, + scrollable: true, + items: [ + { + xtype: 'component', + padding: 5, + style: { + 'white-space': 'pre', + 'font-family': 'monospace', + }, + bind: { + html: '{frr_diff}', + }, + }, + ], + }, + { + xtype: 'panel', + title: gettext('Interfaces Config'), + flex: 1, + scrollable: true, + items: [ + { + xtype: 'component', + padding: 5, + style: { + 'white-space': 'pre', + 'font-family': 'monospace', + }, + bind: { + html: '{interfaces_diff}', + }, + }, + ], + }, + ], + buttons: [ + { + text: gettext('Close'), + handler: function () { + this.up('window').close(); + }, + }, + ], +}); 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, -- 2.47.3