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 16B407AD5C for ; Mon, 10 May 2021 17:37:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 132A41A7A5 for ; Mon, 10 May 2021 17:37:14 +0200 (CEST) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 972441A77C for ; Mon, 10 May 2021 17:37:11 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 847419ED3D; Mon, 10 May 2021 17:37:10 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 10 May 2021 17:37:09 +0200 Message-Id: <20210510153709.2271214-4-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210510153709.2271214-1-aderumier@odiso.com> References: <20210510153709.2271214-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.160 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.249 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.398 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 pve-manager 1/1] ui: lxc: network: sdn display improvements 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, 10 May 2021 15:37:14 -0000 - Display "auto ipam" for empty text when ipam is enabled on vnet - clear ip/gw value on vnet change - disable/enable vlan tag for non/vlanaware vnets Signed-off-by: Alexandre Derumier --- www/manager6/form/BridgeSelector.js | 2 +- www/manager6/lxc/Network.js | 34 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/www/manager6/form/BridgeSelector.js b/www/manager6/form/BridgeSelector.js index 350588cd..227976af 100644 --- a/www/manager6/form/BridgeSelector.js +++ b/www/manager6/form/BridgeSelector.js @@ -5,7 +5,7 @@ Ext.define('PVE.form.BridgeSelector', { bridgeType: 'any_bridge', // bridge, OVSBridge or any_bridge store: { - fields: ['iface', 'active', 'type'], + fields: ['iface', 'active', 'ipam', 'type', 'vlanaware'], filterOnLoad: true, sorters: [ { diff --git a/www/manager6/lxc/Network.js b/www/manager6/lxc/Network.js index 9fe479f8..a0274201 100644 --- a/www/manager6/lxc/Network.js +++ b/www/manager6/lxc/Network.js @@ -131,6 +131,40 @@ Ext.define('PVE.lxc.NetworkInputPanel', { fieldLabel: gettext('Bridge'), value: cdata.bridge, allowBlank: false, + listeners: { + change: function(combo, newValue) { + var store = combo.getStore(); + var rec = store.findRecord('iface', newValue, 0, false, true, true); + if (!rec) { + return; + } + + if (rec.data.type === 'vnet' && !rec.data.vlanaware) { + me.down('field[name=tag]').setDisabled(true); + } else { + me.down('field[name=tag]').setDisabled(false); + } + + if (rec.data.type === 'vnet') { + me.down('field[name=ip]').setValue(''); + me.down('field[name=gw]').setValue(''); + me.down('field[name=ip6]').setValue(''); + me.down('field[name=gw6]').setValue(''); + } + + if (!rec.data.ipam) { + me.down('field[name=ip]').setEmptyText(Proxmox.Utils.NoneText); + me.down('field[name=gw]').setEmptyText(Proxmox.Utils.NoneText); + me.down('field[name=ip6]').setEmptyText(Proxmox.Utils.NoneText); + me.down('field[name=gw6]').setEmptyText(Proxmox.Utils.NoneText); + } else { + me.down('field[name=ip]').setEmptyText('auto (ipam)'); + me.down('field[name=gw]').setEmptyText('auto (ipam)'); + me.down('field[name=ip6]').setEmptyText('auto (ipam)'); + me.down('field[name=gw6]').setEmptyText('auto (ipam)'); + } + }, + }, }, { xtype: 'pveVlanField', -- 2.20.1