From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BAA49756EB for ; Wed, 21 Apr 2021 23:53:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B8A3C14E1A for ; Wed, 21 Apr 2021 23:53:41 +0200 (CEST) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7F28814DF3 for ; Wed, 21 Apr 2021 23:53:40 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 61C6D8D6AA; Wed, 21 Apr 2021 23:53:40 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 21 Apr 2021 23:53:37 +0200 Message-Id: <20210421215339.1801755-3-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210421215339.1801755-1-aderumier@odiso.com> References: <20210421215339.1801755-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.166 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.399 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH v12 pve-manager 2/4] sdn: move mac option from vnet to evpn zone plugin X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 21:53:41 -0000 Signed-off-by: Alexandre Derumier --- www/manager6/sdn/VnetEdit.js | 16 +--------------- www/manager6/sdn/zones/EvpnEdit.js | 12 ++++++++++++ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/www/manager6/sdn/VnetEdit.js b/www/manager6/sdn/VnetEdit.js index 1ed20994..191b73c9 100644 --- a/www/manager6/sdn/VnetEdit.js +++ b/www/manager6/sdn/VnetEdit.js @@ -13,10 +13,6 @@ Ext.define('PVE.sdn.VnetInputPanel', { delete values.vlanaware; } - if (!values.mac) { - delete values.mac; - } - return values; }, @@ -60,17 +56,7 @@ Ext.define('PVE.sdn.VnetInputPanel', { checked: false, fieldLabel: gettext('VLAN Aware'), } - ], - advancedItems: [ - { - xtype: 'textfield', - name: 'mac', - fieldLabel: gettext('MAC address'), - vtype: 'MacAddress', - allowBlank: true, - emptyText: 'auto' - }, - ], + ] }); Ext.define('PVE.sdn.VnetEdit', { diff --git a/www/manager6/sdn/zones/EvpnEdit.js b/www/manager6/sdn/zones/EvpnEdit.js index 65777190..834843ec 100644 --- a/www/manager6/sdn/zones/EvpnEdit.js +++ b/www/manager6/sdn/zones/EvpnEdit.js @@ -12,6 +12,10 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', { delete values.zone; } + if (!values.mac) { + delete values.mac; + } + return values; }, @@ -35,6 +39,14 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', { fieldLabel: 'VRF-VXLAN Tag', allowBlank: false, }, + { + xtype: 'textfield', + name: 'mac', + fieldLabel: gettext('Vnet MAC address'), + vtype: 'MacAddress', + allowBlank: true, + emptyText: 'auto' + }, { xtype: 'pveNodeSelector', name: 'exitnodes', -- 2.20.1