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 61A236C09B for ; Fri, 19 Mar 2021 13:17:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 588F12261C for ; Fri, 19 Mar 2021 13:16:32 +0100 (CET) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id CCAD0225CF for ; Fri, 19 Mar 2021 13:16:26 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 0118D77519; Fri, 19 Mar 2021 13:07:13 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Fri, 19 Mar 2021 13:07:12 +0100 Message-Id: <20210319120712.88393-2-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210319120712.88393-1-aderumier@odiso.com> References: <20210319120712.88393-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.173 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.25 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.399 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: cloudinit : use new cloudinit config api 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, 19 Mar 2021 12:17:02 -0000 --- www/manager6/qemu/CloudInit.js | 44 ++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/www/manager6/qemu/CloudInit.js b/www/manager6/qemu/CloudInit.js index ccd1840b..423f09ef 100644 --- a/www/manager6/qemu/CloudInit.js +++ b/www/manager6/qemu/CloudInit.js @@ -133,13 +133,20 @@ Ext.define('PVE.qemu.CloudInit', { return; } var id = record.data.key; + var pending = record.data.pending; var value = record.data.value; var ciregex = new RegExp("vm-" + me.pveSelNode.data.vmid + "-cloudinit"); - if (id.match(/^(ide|scsi|sata)\d+$/) && ciregex.test(value)) { + if (id.match(/^(ide|scsi|sata)\d+$/)) { + if(ciregex.test(pending)) { + found = id; + me.ciDriveId = found; + me.ciDrive = pending; + } else if (ciregex.test(value)) { found = id; me.ciDriveId = found; me.ciDrive = value; } + } }); me.down('#savebtn').setDisabled(!found); @@ -188,12 +195,13 @@ Ext.define('PVE.qemu.CloudInit', { } var caps = Ext.state.Manager.get('GuiCap'); me.baseurl = '/api2/extjs/nodes/' + nodename + '/qemu/' + vmid; - me.url = me.baseurl + '/pending'; + me.url = me.baseurl + '/cloudinit'; me.editorConfig.url = me.baseurl + '/config'; me.editorConfig.pveSelNode = me.pveSelNode; let caps_ci = caps.vms['VM.Config.Cloudinit'] || caps.vms['VM.Config.Network']; /* editor is string and object */ + me.rows = { ciuser: { header: gettext('User'), @@ -239,6 +247,13 @@ Ext.define('PVE.qemu.CloudInit', { return value || Proxmox.Utils.noneText; }, }, + name: { + header: gettext('Hostname'), + iconCls: 'fa fa-globe', + editor: undefined, + never_delete: true, + defaultValue: '', + }, searchdomain: { header: gettext('DNS domain'), iconCls: 'fa fa-globe', @@ -291,35 +306,24 @@ Ext.define('PVE.qemu.CloudInit', { }, }; var i; - var ipconfig_renderer = function(value, md, record, ri, ci, store, pending) { - var id = record.data.key; - var match = id.match(/^net(\d+)$/); - var val = ''; - if (match) { - val = me.getObjectValue('ipconfig'+match[1], '', pending); - } - return val; - }; + for (i = 0; i < 32; i++) { - // we want to show an entry for every network device - // even if it is empty - me.rows['net' + i.toString()] = { - multiKey: ['ipconfig' + i.toString(), 'net' + i.toString()], + me.rows['ipconfig' + i.toString()] = { header: gettext('IP Config') + ' (net' + i.toString() +')', editor: caps.vms['VM.Config.Network'] ? 'PVE.qemu.IPConfigEdit' : undefined, iconCls: 'fa fa-exchange', - renderer: ipconfig_renderer, - }; - me.rows['ipconfig' + i.toString()] = { - visible: false, + visible: true, }; } PVE.Utils.forEachBus(['ide', 'scsi', 'sata'], function(type, id) { me.rows[type+id] = { - visible: false, + title: 'Cloud-Init', + iconCls: 'fa fa-cloud', + never_delete: true, }; }); + me.callParent(); me.mon(me.rstore, 'load', me.set_button_status, me); }, -- 2.20.1