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 C04B463422 for ; Wed, 15 Jul 2020 15:05:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BD9BE8D17 for ; Wed, 15 Jul 2020 15:05:12 +0200 (CEST) Received: from mailpro.odiso.net (mailpro.odiso.net [89.248.211.110]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 53E548CE4 for ; Wed, 15 Jul 2020 15:05:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 349AD13521F3; Wed, 15 Jul 2020 15:05:11 +0200 (CEST) Received: from mailpro.odiso.net ([127.0.0.1]) by localhost (mailpro.odiso.net [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id h5i7QvC5HJNB; Wed, 15 Jul 2020 15:05:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 1AE4F135220C; Wed, 15 Jul 2020 15:05:11 +0200 (CEST) X-Virus-Scanned: amavisd-new at mailpro.odiso.com Received: from mailpro.odiso.net ([127.0.0.1]) by localhost (mailpro.odiso.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id zOeCHAchRH8g; Wed, 15 Jul 2020 15:05:11 +0200 (CEST) Received: from pve.fritz.box (unknown [213.211.148.86]) by mailpro.odiso.net (Postfix) with ESMTPSA id DEB8813521F5; Wed, 15 Jul 2020 15:05:10 +0200 (CEST) From: Alexandre Derumier To: pve-devel@pve.proxmox.com Date: Wed, 15 Jul 2020 15:05:02 +0200 Message-Id: <20200715130504.25390-2-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200715130504.25390-1-aderumier@odiso.com> References: <20200715130504.25390-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v2 pve-manager 1/3] sdn: vnetedit: add subnets && remove ip/mac 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, 15 Jul 2020 13:05:12 -0000 Signed-off-by: Alexandre Derumier --- www/manager6/sdn/VnetEdit.js | 29 +++-------------------------- www/manager6/sdn/VnetView.js | 18 +++--------------- 2 files changed, 6 insertions(+), 41 deletions(-) diff --git a/www/manager6/sdn/VnetEdit.js b/www/manager6/sdn/VnetEdit.js index aa40b41f..09e2f3bf 100644 --- a/www/manager6/sdn/VnetEdit.js +++ b/www/manager6/sdn/VnetEdit.js @@ -64,34 +64,11 @@ Ext.define('PVE.sdn.VnetInputPanel', { }, { xtype: 'textfield', - name: 'mac', - fieldLabel: gettext('MAC Address'), - vtype: 'MacAddress', - skipEmptyText: true, + name: 'subnets', + fieldLabel: gettext('Subnets'), allowBlank: true, - emptyText: 'auto', }, - ], - advancedItems: [ - { - xtype: 'textfield', - name: 'ipv4', - vtype: 'IPCIDRAddress', - fieldLabel: 'IPv4/CIDR', // do not localize - emptyText: 'Optional anycast addr. for BGP', - skipEmptyText: true, - allowBlank: true, - }, - { - xtype: 'textfield', - name: 'ipv6', - vtype: 'IP6CIDRAddress', - fieldLabel: 'IPv6/CIDR', // do not localize - emptyText: 'Optional anycast addr. for BGP', - skipEmptyText: true, - allowBlank: true, - }, - ], + ] }); =20 Ext.define('PVE.sdn.VnetEdit', { diff --git a/www/manager6/sdn/VnetView.js b/www/manager6/sdn/VnetView.js index e73632d1..604a2d1a 100644 --- a/www/manager6/sdn/VnetView.js +++ b/www/manager6/sdn/VnetView.js @@ -98,20 +98,10 @@ Ext.define('PVE.sdn.VnetView', { dataIndex: 'vlanaware', }, { - header: 'IPv4/CIDR', + header: 'Subnets', flex: 1, - dataIndex: 'ipv4', + dataIndex: 'subnets', }, - { - header: 'IPv6/CIDR', - flex: 1, - dataIndex: 'ipv6', - }, - { - header: 'MAC', - flex: 1, - dataIndex: 'mac', - } ], listeners: { activate: reload, @@ -127,9 +117,7 @@ Ext.define('PVE.sdn.VnetView', { extend: 'Ext.data.Model', fields: [ 'alias', - 'ipv4', - 'ipv6', - 'mac', + 'subnets', 'tag', 'type', 'vnet', --=20 2.20.1