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 71D6760FA5 for ; Fri, 11 Sep 2020 12:08:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C87E52399E for ; Fri, 11 Sep 2020 12:08:25 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id AF99C2396F for ; Fri, 11 Sep 2020 12:08:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7AC7C44B58 for ; Fri, 11 Sep 2020 12:08:23 +0200 (CEST) From: Hannes Laimer To: pve-devel@lists.proxmox.com Date: Fri, 11 Sep 2020 12:08:16 +0200 Message-Id: <20200911100816.80543-6-h.laimer@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200911100816.80543-1-h.laimer@proxmox.com> References: <20200911100816.80543-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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_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 Subject: [pve-devel] [PATCH v1 pve-manager 5/5] out/in-rate in network edit, keep rate to still be able to open old configs 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: Fri, 11 Sep 2020 10:08:56 -0000 Signed-off-by: Hannes Laimer --- www/manager6/Parser.js | 18 ++++++++++++++++++ www/manager6/qemu/NetworkEdit.js | 27 ++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/www/manager6/Parser.js b/www/manager6/Parser.js index b793a28e..eac31f2f 100644 --- a/www/manager6/Parser.js +++ b/www/manager6/Parser.js @@ -131,6 +131,10 @@ Ext.define('PVE.Parser', { statics: { res.bridge = match_res[1]; } else if ((match_res = p.match(/^rate=(\d+(\.\d+)?)$/)) !== null) { res.rate = match_res[1]; + } else if ((match_res = p.match(/^outrate=(\d+(\.\d+)?)$/)) !== null) { + res.outrate = match_res[1]; + } else if ((match_res = p.match(/^inrate=(\d+(\.\d+)?)$/)) !== null) { + res.inrate = match_res[1]; } else if ((match_res = p.match(/^tag=(\d+(\.\d+)?)$/)) !== null) { res.tag = match_res[1]; } else if ((match_res = p.match(/^firewall=(\d+)$/)) !== null) { @@ -146,6 +150,14 @@ Ext.define('PVE.Parser', { statics: { return false; // break } }); + if (res.rate) { + if (!res.inrate) { + res.inrate = res.rate; + } + if (!res.outrate) { + res.outrate = res.rate; + } + } if (errors || !res.model) { return; @@ -172,6 +184,12 @@ Ext.define('PVE.Parser', { statics: { if (net.rate) { netstr += ",rate=" + net.rate; } + if (net.outrate) { + netstr += ",outrate=" + net.outrate; + } + if (net.inrate) { + netstr += ",inrate=" + net.inrate; + } if (net.queues) { netstr += ",queues=" + net.queues; } diff --git a/www/manager6/qemu/NetworkEdit.js b/www/manager6/qemu/NetworkEdit.js index 3b093b46..8428a2aa 100644 --- a/www/manager6/qemu/NetworkEdit.js +++ b/www/manager6/qemu/NetworkEdit.js @@ -25,7 +25,16 @@ Ext.define('PVE.qemu.NetworkInputPanel', { } else { delete me.network.rate; } - + if (values.outrate) { + me.network.outrate = values.outrate; + } else { + delete me.network.outrate; + } + if (values.inrate) { + me.network.inrate = values.inrate; + } else { + delete me.network.inrate; + } var params = {}; params[me.confid] = PVE.Parser.printQemuNetwork(me.network); @@ -111,6 +120,8 @@ Ext.define('PVE.qemu.NetworkInputPanel', { 'model', 'macaddr', 'rate', + 'outrate', + 'inrate', 'queues' ]; fields.forEach(function(fieldname) { @@ -144,8 +155,18 @@ Ext.define('PVE.qemu.NetworkInputPanel', { me.advancedColumn2 = [ { xtype: 'numberfield', - name: 'rate', - fieldLabel: gettext('Rate limit') + ' (MB/s)', + name: 'outrate', + fieldLabel: gettext('Upload limit') + ' (MB/s)', + minValue: 0, + maxValue: 10*1024, + value: '', + emptyText: 'unlimited', + allowBlank: true + }, + { + xtype: 'numberfield', + name: 'inrate', + fieldLabel: gettext('Download limit') + ' (MB/s)', minValue: 0, maxValue: 10*1024, value: '', -- 2.20.1