From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 45AB71FF13E for ; Fri, 06 Mar 2026 13:54:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 64BDA32D0C; Fri, 6 Mar 2026 13:54:42 +0100 (CET) From: Gabriel Goller To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v4 1/1] sdn: add dry-run diff view for sdn apply Date: Fri, 6 Mar 2026 13:53:13 +0100 Message-ID: <20260306125315.190298-20-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260306125315.190298-1-g.goller@proxmox.com> References: <20260306125315.190298-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1772801572968 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.013 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 RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) 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: 46W7KG44BZGNHAUOAIAFUBJANNW3XDOM X-Message-ID-Hash: 46W7KG44BZGNHAUOAIAFUBJANNW3XDOM 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 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 needing to apply the config. Signed-off-by: Gabriel Goller --- 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/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..e32e4cf896c4 --- /dev/null +++ b/www/manager6/sdn/SdnDiffView.js @@ -0,0 +1,149 @@ +Ext.define('PVE.sdn.SdnDiffView', { + extend: 'Ext.window.Window', + + width: 800, + height: 900, + + scrollable: true, + modal: true, + title: gettext('Pending SDN configuration changes'), + + node: undefined, + + viewModel: { + data: { + frr_diff: undefined, + interfaces_diff: undefined, + }, + }, + + items: [ + { + xtype: 'panel', + title: gettext('FRR Config'), + bodyPadding: 10, + items: [ + { + xtype: 'displayfield', + bind: { + value: '{frr_diff}', + }, + }, + ], + }, + { + xtype: 'panel', + title: gettext('Interfaces Config'), + bodyPadding: 10, + items: [ + { + xtype: 'displayfield', + bind: { + value: '{interfaces_diff}', + }, + }, + ], + }, + ], + buttons: [ + { + handler: function () { + this.up('window').close(); + }, + text: gettext('Close'), + }, + ], + + 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) + .then((diff) => { + if (diff['frr-diff'] === null) { + this.getViewModel().set('frr_diff', 'no changes'); + } else { + this.getViewModel().set('frr_diff', '
' + diff['frr-diff'] + '
'); + } + if (diff['interfaces-diff'] === null) { + this.getViewModel().set('interfaces_diff', 'no changes'); + } else { + this.getViewModel().set( + 'interfaces_diff', + '
' + diff['interfaces-diff'] + '
', + ); + } + }) + .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, -- 2.47.3