From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-manager v3 23/26] ui: fabrics: wireguard: add node edit panel
Date: Mon, 4 May 2026 18:11:06 +0200 [thread overview]
Message-ID: <20260504161115.408970-24-s.hanreich@proxmox.com> (raw)
In-Reply-To: <20260504161115.408970-1-s.hanreich@proxmox.com>
Add a component for creating / updating nodes of a Wireguard fabric.
There are some key differences compared to OSPF / OpenFabric nodes,
mostly that WireGuard nodes can have different roles and that
WireGuard interfaces are not selected from the existing interfaces of
the node, but rather created. This requires some changes to the
existing NodeEdit panel provided by the fabrics:
* do not load available interfaces, but rather available peers
* let users create interfaces rather than select them
* add an additional roleSelector to the existing nodeSelector
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
www/manager6/Makefile | 1 +
.../sdn/fabrics/wireguard/NodeEdit.js | 232 ++++++++++++++++++
2 files changed, 233 insertions(+)
create mode 100644 www/manager6/sdn/fabrics/wireguard/NodeEdit.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 76266ad28..f7c40ee04 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -344,6 +344,7 @@ JSSRC= \
sdn/fabrics/ospf/NodeEdit.js \
sdn/fabrics/ospf/FabricEdit.js \
sdn/fabrics/wireguard/InterfacePanel.js \
+ sdn/fabrics/wireguard/NodeEdit.js \
storage/ContentView.js \
storage/BackupView.js \
storage/Base.js \
diff --git a/www/manager6/sdn/fabrics/wireguard/NodeEdit.js b/www/manager6/sdn/fabrics/wireguard/NodeEdit.js
new file mode 100644
index 000000000..33025577a
--- /dev/null
+++ b/www/manager6/sdn/fabrics/wireguard/NodeEdit.js
@@ -0,0 +1,232 @@
+Ext.define('PVE.sdn.Fabric.WireGuard.Node.Edit', {
+ extend: 'PVE.sdn.Fabric.Node.Edit',
+ protocol: 'wireguard',
+
+ extraRequestParams: {
+ protocol: 'wireguard',
+ },
+
+ referenceHolder: true,
+
+ // handled in the interface configuration (for now)
+ hasIpv4Support: false,
+ hasIpv6Support: false,
+
+ viewModel: {
+ data: {
+ current: {
+ isPveNode: true,
+ },
+ },
+ stores: {
+ availablePeers: {
+ model: 'Pve.sdn.Fabric.WireGuard.Peer',
+ },
+ interfaces: {
+ model: 'Pve.sdn.Fabric.WireGuard.Interface',
+ },
+ },
+ formulas: {
+ selectedInterface: {
+ bind: '{interfaceGrid.selection}',
+ get: function (selection) {
+ if (Array.isArray(selection)) {
+ return selection[0];
+ }
+
+ return selection;
+ },
+ },
+ nodeSelectorDisabled: function (get) {
+ return get('isCreate') || !get('current.isPveNode');
+ },
+ },
+ },
+
+ additionalItems: [
+ {
+ xtype: 'proxmoxtextfield',
+ fieldLabel: gettext('Name'),
+ labelWidth: 120,
+ name: 'node_id',
+ bind: {
+ hidden: '{current.isPveNode}',
+ disabled: '{current.isPveNode}',
+ },
+ allowBlank: false,
+ },
+ {
+ xtype: 'proxmoxtextfield',
+ fieldLabel: gettext('Public Key'),
+ labelWidth: 120,
+ name: 'public_key',
+ bind: {
+ hidden: '{current.isPveNode}',
+ disabled: '{current.isPveNode}',
+ },
+ allowBlank: false,
+ },
+ {
+ xtype: 'proxmoxtextfield',
+ fieldLabel: gettext('Endpoint'),
+ emptyText: gettext('Listen Address for WireGuard'),
+ labelWidth: 120,
+ name: 'endpoint',
+ allowBlank: false,
+ },
+ {
+ xtype: 'proxmoxtextfield',
+ fieldLabel: gettext('Allowed IPs'),
+ emptyText: gettext('Allowed Destination IPs for traffic coming from this node.'),
+ labelWidth: 120,
+ name: 'allowed_ips',
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ },
+ // TODO: implement proper list selection field that handles
+ // converting from / to array
+ setValue: function (value) {
+ if (Ext.isArray(value)) {
+ value = value.join(',');
+ }
+
+ this.setRawValue(value);
+ },
+ getSubmitValue: function () {
+ let value = this.getValue();
+ return value ? this.getValue().split(',') : null;
+ },
+ },
+ ],
+
+ loadAvailablePeers: async function () {
+ let me = this;
+
+ let response = await Proxmox.Async.api2({
+ url: `/cluster/sdn/fabrics/node/${me.fabricId}`,
+ method: 'GET',
+ });
+
+ return response.result.data.flatMap((node) => {
+ let availablePeers = [];
+
+ let peer = {
+ type: node.role,
+ endpoint: node.endpoint,
+ allowed_ips: node.allowed_ips,
+ node: node.node_id,
+ };
+
+ if (node.role === 'internal') {
+ for (let iface of node.interfaces) {
+ let parsed_iface = PVE.Parser.parsePropertyString(iface);
+
+ let iface_peer = structuredClone(peer);
+ iface_peer.node_iface = parsed_iface.name;
+ iface_peer.id = `${iface_peer.node}_${iface_peer.node_iface}`;
+
+ availablePeers.push(iface_peer);
+ }
+ } else if (node.role === 'external') {
+ peer.id = peer.node;
+ availablePeers.push(peer);
+ } else {
+ throw `unknown node type: ${node.role}`;
+ }
+
+ return availablePeers;
+ });
+ },
+
+ load: function () {
+ let me = this;
+
+ me.setLoading(gettext('fetching node information'));
+
+ Promise.all([me.loadNode(me.fabricId, me.nodeId), me.loadAvailablePeers()])
+ .catch(Proxmox.Utils.alertResponseFailure)
+ .then(([node, availablePeers]) => {
+ me.interfaceSelector.setAvailablePeers(availablePeers);
+
+ node.interfaces = node.interfaces ?? [];
+ node.peers = node.peers ?? [];
+
+ me.interfaceSelector.setNode(node);
+ me.setValues(node);
+ })
+ .finally(() => {
+ me.setLoading(false);
+ });
+ },
+
+ getNodeSelectorConfig: function () {
+ let me = this;
+ let config = me.callParent();
+
+ Ext.Object.merge(config, {
+ store: {
+ listeners: {
+ load: function (store) {
+ if (store.count() === 0) {
+ me.lookupReference('roleSelector').select('external');
+ me.lookupReference('nodeSelector').setDisabled(true);
+ }
+ },
+ },
+ },
+ });
+
+ return config;
+ },
+
+ getNodeSelector: function () {
+ let me = this;
+
+ let nodeSelector = me.callParent();
+ nodeSelector.setDisabled(!me.isCreate);
+
+ let roleSelector = Ext.create({
+ xtype: 'combobox',
+ name: 'role',
+ labelWidth: 120,
+ fieldLabel: gettext('Type'),
+ emptyText: gettext('Node'),
+ editable: false,
+ disabled: !me.isCreate,
+ reference: 'roleSelector',
+ value: 'internal',
+ store: [
+ ['internal', gettext('Node')],
+ ['external', gettext('External')],
+ ],
+ listeners: {
+ change: function (_this, newValue) {
+ me.getViewModel().set('current.isPveNode', newValue === 'internal');
+ },
+ },
+ });
+
+ return Ext.create({
+ xtype: 'inputpanel',
+ items: [roleSelector, nodeSelector],
+ });
+ },
+
+ initComponent: function () {
+ let me = this;
+
+ me.callParent();
+
+ me.interfaceSelector.setBind({
+ hidden: '{!current.isPveNode}',
+ disabled: '{!current.isPveNode}',
+ });
+
+ // needs to lookup the specific reference, because me.nodeSelector is
+ // the whole input panel that includes roleSelector as well.
+ me.lookupReference('nodeSelector').setBind({
+ hidden: '{!current.isPveNode}',
+ disabled: '{nodeSelectorDisabled}',
+ });
+ },
+});
--
2.47.3
next prev parent reply other threads:[~2026-05-04 16:15 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-04 16:10 [PATCH manager/network/proxmox{,-ve-rs,-perl-rs} v3 00/26] Add WireGuard as protocol to SDN fabrics Stefan Hanreich
2026-05-04 16:10 ` [PATCH proxmox v3 01/26] wireguard: skip serializing preshared_key if unset Stefan Hanreich
2026-05-04 16:10 ` [PATCH proxmox v3 02/26] wireguard: implement ApiType for endpoints and hostnames Stefan Hanreich
2026-05-04 16:10 ` [PATCH proxmox-ve-rs v3 03/26] sdn-types: add wireguard-specific PersistentKeepalive api type Stefan Hanreich
2026-05-04 16:10 ` [PATCH proxmox-ve-rs v3 04/26] ve-config: fabrics: split interface name regex into two parts Stefan Hanreich
2026-05-04 16:10 ` [PATCH proxmox-ve-rs v3 05/26] ve-config: fabric: refactor fabric config entry impl using macro Stefan Hanreich
2026-05-04 16:10 ` [PATCH proxmox-ve-rs v3 06/26] ve-config: fabrics: add protocol-specific properties for wireguard Stefan Hanreich
2026-05-04 16:10 ` [PATCH proxmox-ve-rs v3 07/26] ve-config: sdn: fabrics: add wireguard to the fabric config Stefan Hanreich
2026-05-04 16:10 ` [PATCH proxmox-ve-rs v3 08/26] ve-config: fabrics: wireguard add validation for wireguard config Stefan Hanreich
2026-05-04 16:10 ` [PATCH proxmox-ve-rs v3 09/26] ve-config: fabrics: implement wireguard config generation Stefan Hanreich
2026-05-04 16:10 ` [PATCH proxmox-perl-rs v3 10/26] pve-rs: fabrics: wireguard: generate ifupdown2 configuration Stefan Hanreich
2026-05-04 16:10 ` [PATCH proxmox-perl-rs v3 11/26] pve-rs: fabrics: add helpers for parsing interface property strings Stefan Hanreich
2026-05-04 16:10 ` [PATCH pve-network v3 12/26] sdn: add wireguard helper module Stefan Hanreich
2026-05-04 16:10 ` [PATCH pve-network v3 13/26] fabrics: wireguard: add schema definitions for wireguard Stefan Hanreich
2026-05-04 16:10 ` [PATCH pve-network v3 14/26] fabrics: wireguard: implement wireguard key auto-generation Stefan Hanreich
2026-05-04 16:10 ` [PATCH pve-manager v3 15/26] network: sdn: generate wireguard configuration on apply Stefan Hanreich
2026-05-04 16:10 ` [PATCH pve-manager v3 16/26] ui: fix parsing of property-strings when values contain = Stefan Hanreich
2026-05-04 16:11 ` [PATCH pve-manager v3 17/26] ui: fabrics: i18n: make node loading string translatable Stefan Hanreich
2026-05-04 16:11 ` [PATCH pve-manager v3 18/26] ui: fabrics: split node selector creation and config Stefan Hanreich
2026-05-04 16:11 ` [PATCH pve-manager v3 19/26] ui: fabrics: edit: make ipv4/6 support generic over fabric panels Stefan Hanreich
2026-05-04 16:11 ` [PATCH pve-manager v3 20/26] ui: fabrics: node: make ipv4/6 support generic over edit panels Stefan Hanreich
2026-05-04 16:11 ` [PATCH pve-manager v3 21/26] ui: fabrics: interface: " Stefan Hanreich
2026-05-04 16:11 ` [PATCH pve-manager v3 22/26] ui: fabrics: wireguard: add interface edit panel Stefan Hanreich
2026-05-04 16:11 ` Stefan Hanreich [this message]
2026-05-04 16:11 ` [PATCH pve-manager v3 24/26] ui: fabrics: wireguard: add fabric " Stefan Hanreich
2026-05-04 16:11 ` [PATCH pve-manager v3 25/26] ui: fabrics: hook up wireguard components Stefan Hanreich
2026-05-04 16:11 ` [PATCH pve-manager v3 26/26] fabrics: node edit: add option to include wireguard interfaces Stefan Hanreich
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=20260504161115.408970-24-s.hanreich@proxmox.com \
--to=s.hanreich@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