From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id A08AA1FF0E3 for ; Tue, 27 Oct 2026 10:01:26 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 105B821ABF; Tue, 27 Oct 2026 09:56:47 +0100 (CET) From: Hannes Laimer To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v3 36/45] ui: sdn: microseg: add tag matcher Date: Tue, 27 Oct 2026 09:55:18 +0100 Message-ID: <20261027085527.702738-37-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261027085527.702738-1-h.laimer@proxmox.com> References: <20261027085527.702738-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1793091372760 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.351 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: 4FLES43OEHSXIKYZF7YROLVNASBMLF6Y X-Message-ID-Hash: 4FLES43OEHSXIKYZF7YROLVNASBMLF6Y X-MailFrom: h.laimer@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: Signed-off-by: Hannes Laimer --- www/manager6/Utils.js | 14 +++++++ www/manager6/sdn/microseg/AssignmentEdit.js | 46 +++++++++++++++++++++ www/manager6/sdn/microseg/AssignmentView.js | 2 + 3 files changed, 62 insertions(+) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 8eb4b68c51b4..71c010bc91cc 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -999,6 +999,13 @@ Ext.define('PVE.Utils', { faIcon: 'link', assignment: true, }, + 'tag-assignment': { + name: gettext('Tag Assignment'), + ipanel: 'TagAssignmentInputPanel', + width: 400, + faIcon: 'tag', + assignment: true, + }, }, sdnmicroseg_is_assignment: function (type) { @@ -1037,6 +1044,13 @@ Ext.define('PVE.Utils', { return Proxmox.Utils.unknownText; } let iface = (assignment.iface ?? '') === '' ? '' : ` net${assignment.iface}`; + if (assignment.type === 'tag-assignment') { + let tags = PVE.Utils.format_sdnmicroseg_predicate( + assignment['tag-match'], + assignment.tags, + ); + return `${tags}${iface}`; + } return `vm${assignment.vmid}${iface}`; }, diff --git a/www/manager6/sdn/microseg/AssignmentEdit.js b/www/manager6/sdn/microseg/AssignmentEdit.js index 71cabaeeea52..470ca15a271d 100644 --- a/www/manager6/sdn/microseg/AssignmentEdit.js +++ b/www/manager6/sdn/microseg/AssignmentEdit.js @@ -78,3 +78,49 @@ Ext.define('PVE.sdn.microseg.GuestAssignmentInputPanel', { me.callParent(); }, }); + +Ext.define('PVE.sdn.microseg.TagAssignmentInputPanel', { + extend: 'PVE.sdn.microseg.AssignmentInputPanel', + + onGetValues: function (values) { + let me = this; + if (typeof values.tags === 'string') { + values.tags = values.tags.split(';').filter((tag) => tag !== ''); + } + return me.callParent([values]); + }, + + initComponent: function () { + let me = this; + + me.matcherItems = [ + { + xtype: 'pveTagFieldSet', + name: 'tags', + maxHeight: 150, + disabled: !me.isCreate, + getErrors: function (value) { + let errors = PVE.form.TagFieldSet.prototype.getErrors.call(this, value); + if (this.getValue() === '') { + errors.push(gettext('At least one tag is required')); + } + return errors; + }, + }, + { + xtype: 'proxmoxKVComboBox', + name: 'tag-match', + fieldLabel: gettext('Tag Match'), + value: 'any', + disabled: !me.isCreate, + comboItems: [ + ['any', gettext('Any (shares a tag)')], + ['all', gettext('All (has every tag)')], + ['exact', gettext('Exact (same tags)')], + ], + }, + ]; + + me.callParent(); + }, +}); diff --git a/www/manager6/sdn/microseg/AssignmentView.js b/www/manager6/sdn/microseg/AssignmentView.js index 4744380461a7..0dc96dc831eb 100644 --- a/www/manager6/sdn/microseg/AssignmentView.js +++ b/www/manager6/sdn/microseg/AssignmentView.js @@ -181,6 +181,8 @@ Ext.define( 'type', 'vmid', 'iface', + 'tags', + 'tag-match', 'groups', 'comment', 'state', -- 2.47.3