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 831A9632C8 for ; Mon, 24 Aug 2020 18:48:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 344111F1F6 for ; Mon, 24 Aug 2020 18:48:59 +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 217E01F167 for ; Mon, 24 Aug 2020 18:48:55 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 03C1415A4C7D; Mon, 24 Aug 2020 18:48:55 +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 kniSb3brNoNk; Mon, 24 Aug 2020 18:48:54 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id DDAD415A4C84; Mon, 24 Aug 2020 18:48:54 +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 QH7_YmN-0SxS; Mon, 24 Aug 2020 18:48:54 +0200 (CEST) Received: from pve.fritz.box (unknown [213.211.148.86]) by mailpro.odiso.net (Postfix) with ESMTPSA id AD34F15A4C68; Mon, 24 Aug 2020 18:48:54 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 24 Aug 2020 18:48:47 +0200 Message-Id: <20200824164847.12490-9-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200824164847.12490-1-aderumier@odiso.com> References: <20200824164847.12490-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 v4 pve-manager 8/8] add vnet option to subnets and remove subnets list from vnet 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: Mon, 24 Aug 2020 16:48:59 -0000 --- www/manager6/Makefile | 1 + www/manager6/form/SDNVnetSelector.js | 68 ++++++++++++++++++++++++++++ www/manager6/sdn/SubnetEdit.js | 7 +++ www/manager6/sdn/SubnetView.js | 5 ++ www/manager6/sdn/VnetEdit.js | 8 +--- www/manager6/sdn/VnetView.js | 22 +-------- 6 files changed, 83 insertions(+), 28 deletions(-) create mode 100644 www/manager6/form/SDNVnetSelector.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 11761df5..7cb5939d 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -100,6 +100,7 @@ JSSRC=3D \ form/QemuBiosSelector.js \ form/SDNControllerSelector.js \ form/SDNZoneSelector.js \ + form/SDNVnetSelector.js \ form/SDNIpamSelector.js \ form/SDNDnsSelector.js \ form/ScsiHwSelector.js \ diff --git a/www/manager6/form/SDNVnetSelector.js b/www/manager6/form/SDN= VnetSelector.js new file mode 100644 index 00000000..0f9a6613 --- /dev/null +++ b/www/manager6/form/SDNVnetSelector.js @@ -0,0 +1,68 @@ +Ext.define('PVE.form.SDNVnetSelector', { + extend: 'Proxmox.form.ComboGrid', + alias: ['widget.pveSDNVnetSelector'], + + allowBlank: false, + valueField: 'vnet', + displayField: 'vnet', + + initComponent: function() { + var me =3D this; + + var store =3D new Ext.data.Store({ + model: 'pve-sdn-vnet', + sorters: { + property: 'vnet', + order: 'DESC' + }, + }); + + Ext.apply(me, { + store: store, + autoSelect: false, + listConfig: { + columns: [ + { + header: gettext('Vnet'), + sortable: true, + dataIndex: 'vnet', + flex: 1 + }, + { + header: gettext('Alias'), + flex: 1, + dataIndex: 'alias', + }, + { + header: gettext('Tag'), + flex: 1, + dataIndex: 'tag', + } + ] + } + }); + + me.callParent(); + + store.load(); + } + +}, function() { + + Ext.define('pve-sdn-vnet', { + extend: 'Ext.data.Model', + fields: [ + 'alias', + 'tag', + 'type', + 'vnet', + 'zone', + ], + proxy: { + type: 'proxmox', + url: "/api2/json/cluster/sdn/vnets" + }, + idProperty: 'vnet' + }); + +}); diff --git a/www/manager6/sdn/SubnetEdit.js b/www/manager6/sdn/SubnetEdit= .js index ac9a40ea..8badc34a 100644 --- a/www/manager6/sdn/SubnetEdit.js +++ b/www/manager6/sdn/SubnetEdit.js @@ -32,6 +32,13 @@ Ext.define('PVE.sdn.SubnetInputPanel', { allowBlank: false, fieldLabel: gettext('Subnet'), }, + { + xtype: 'pveSDNVnetSelector', + fieldLabel: gettext('Vnet'), + name: 'vnet', + value: '', + allowBlank: true, + }, { xtype: 'textfield', name: 'gateway', diff --git a/www/manager6/sdn/SubnetView.js b/www/manager6/sdn/SubnetView= .js index 95a468bc..012d127b 100644 --- a/www/manager6/sdn/SubnetView.js +++ b/www/manager6/sdn/SubnetView.js @@ -73,6 +73,11 @@ Ext.define('PVE.sdn.SubnetView', { flex: 2, dataIndex: 'cidr' }, + { + header: gettext('Vnet'), + flex: 1, + dataIndex: 'vnet', + }, { header: gettext('Gateway'), flex: 1, diff --git a/www/manager6/sdn/VnetEdit.js b/www/manager6/sdn/VnetEdit.js index 09e2f3bf..03e539ab 100644 --- a/www/manager6/sdn/VnetEdit.js +++ b/www/manager6/sdn/VnetEdit.js @@ -61,13 +61,7 @@ Ext.define('PVE.sdn.VnetInputPanel', { uncheckedValue: 0, checked: false, fieldLabel: gettext('VLAN Aware') - }, - { - xtype: 'textfield', - name: 'subnets', - fieldLabel: gettext('Subnets'), - allowBlank: true, - }, + } ] }); =20 diff --git a/www/manager6/sdn/VnetView.js b/www/manager6/sdn/VnetView.js index 604a2d1a..eefb6e42 100644 --- a/www/manager6/sdn/VnetView.js +++ b/www/manager6/sdn/VnetView.js @@ -96,12 +96,7 @@ Ext.define('PVE.sdn.VnetView', { header: gettext('VLAN Aware'), flex: 1, dataIndex: 'vlanaware', - }, - { - header: 'Subnets', - flex: 1, - dataIndex: 'subnets', - }, + } ], listeners: { activate: reload, @@ -111,19 +106,4 @@ Ext.define('PVE.sdn.VnetView', { =20 me.callParent(); } -}, function() { - - Ext.define('pve-sdn-vnet', { - extend: 'Ext.data.Model', - fields: [ - 'alias', - 'subnets', - 'tag', - 'type', - 'vnet', - 'zone', - ], - idProperty: 'vnet' - }); - }); --=20 2.20.1