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 278897053B for ; Mon, 13 Jun 2022 16:56:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D61DACBC2 for ; Mon, 13 Jun 2022 16:56:28 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 BF740CB6E for ; Mon, 13 Jun 2022 16:56:26 +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 59A4141B10 for ; Mon, 13 Jun 2022 16:56:26 +0200 (CEST) From: Stefan Hrdlicka To: pve-devel@lists.proxmox.com Date: Mon, 13 Jun 2022 16:55:58 +0200 Message-Id: <20220613145559.1021205-3-s.hrdlicka@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613145559.1021205-1-s.hrdlicka@proxmox.com> References: <20220613145559.1021205-1-s.hrdlicka@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.107 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH V3 manager 2/3] fix #3967: enable ZFS dRAID creation in WebGUI 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, 13 Jun 2022 14:56:59 -0000 add fields for additional settings required by ZFS dRAID Signed-off-by: Stefan Hrdlicka --- www/manager6/node/ZFS.js | 69 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/www/manager6/node/ZFS.js b/www/manager6/node/ZFS.js index 5b3bdbda..75d7d8e1 100644 --- a/www/manager6/node/ZFS.js +++ b/www/manager6/node/ZFS.js @@ -9,6 +9,27 @@ Ext.define('PVE.node.CreateZFS', { isCreate: true, width: 800, + viewModel: { + data: { + raidLevel: 'single', + }, + formulas: { + isdraid: function(get) { + return get('raidLevel').startsWith("draid"); + }, + draidconfig: function(get) { + if (get('isdraid')) { + var config = {}; + config.data = get('draiddata'); + config.spares = get('draidspares'); + return PVE.Parser.printPropertyString(config); + } else { + return ""; + } + }, + }, + }, + initComponent: function() { let me = this; @@ -49,7 +70,54 @@ Ext.define('PVE.node.CreateZFS', { ['raidz', 'RAIDZ'], ['raidz2', 'RAIDZ2'], ['raidz3', 'RAIDZ3'], + ['draid', 'dRAID'], + ['draid2', 'dRAID2'], + ['draid3', 'dRAID3'], ], + bind: { + value: '{raidLevel}', + }, + }, + { + xtype: 'proxmoxtextfield', + name: 'draid-config', + hidden: true, + submitValue: true, + bind: { + value: '{draidconfig}', + }, + }, + { + xtype: 'proxmoxintegerfield', + fieldLabel: gettext('DRAID data devices'), + minValue: 1, + allowBlank: false, + disabled: true, + hidden: true, + submitValue: false, + bind: { + disabled: '{!isdraid}', + hidden: '{!isdraid}', + value: '{draiddata}', + }, + reference: 'draiddata', + name: 'draiddata', + }, + { + xtype: 'proxmoxintegerfield', + fieldLabel: gettext('DRAID spares'), + minValue: 0, + allowBlank: false, + disabled: true, + hidden: true, + submitValue: false, + bind: { + disabled: '{!isdraid}', + hidden: '{!isdraid}', + value: '{draidspares}', + }, + reference: 'draidspares', + name: 'draidspares', }, { xtype: 'proxmoxKVComboBox', @@ -101,6 +169,7 @@ Ext.define('PVE.node.CreateZFS', { me.callParent(); }, + }); Ext.define('PVE.node.ZFSList', { -- 2.30.2