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 3E3B870EA0 for ; Wed, 9 Jun 2021 14:02:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3348E23FE4 for ; Wed, 9 Jun 2021 14:02:11 +0200 (CEST) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 435A623FCC for ; Wed, 9 Jun 2021 14:02:10 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 29AB5D19AC; Wed, 9 Jun 2021 14:02:10 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 9 Jun 2021 14:02:07 +0200 Message-Id: <20210609120208.3347788-2-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210609120208.3347788-1-aderumier@odiso.com> References: <20210609120208.3347788-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.963 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.248 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.001 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 v2 pve-manager 1/2] 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: Wed, 09 Jun 2021 12:02:11 -0000 Signed-off-by: Alexandre Derumier --- www/manager6/qemu/CloudInit.js | 85 +++++++++++++++------------------- 1 file changed, 37 insertions(+), 48 deletions(-) diff --git a/www/manager6/qemu/CloudInit.js b/www/manager6/qemu/CloudInit.js index 77ff93d4..573d2945 100644 --- a/www/manager6/qemu/CloudInit.js +++ b/www/manager6/qemu/CloudInit.js @@ -82,38 +82,12 @@ Ext.define('PVE.qemu.CloudInit', { text: gettext('Regenerate Image'), handler: function() { let view = this.up('grid'); - var eject_params = {}; - var insert_params = {}; - let disk = PVE.Parser.parseQemuDrive(view.ciDriveId, view.ciDrive); - var storage = ''; - var stormatch = disk.file.match(/^([^:]+):/); - if (stormatch) { - storage = stormatch[1]; - } - eject_params[view.ciDriveId] = 'none,media=cdrom'; - insert_params[view.ciDriveId] = storage + ':cloudinit'; - - var failure = function(response, opts) { - Ext.Msg.alert('Error', response.htmlStatus); - }; - Proxmox.Utils.API2Request({ - url: view.baseurl + '/config', + url: view.baseurl + '/cloudinit', waitMsgTarget: view, method: 'PUT', - params: eject_params, - failure: failure, callback: function() { - Proxmox.Utils.API2Request({ - url: view.baseurl + '/config', - waitMsgTarget: view, - method: 'PUT', - params: insert_params, - failure: failure, - callback: function() { - view.reload(); - }, - }); + view.reload(); }, }); }, @@ -133,13 +107,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); @@ -168,6 +149,10 @@ Ext.define('PVE.qemu.CloudInit', { var me = this; me.rstore.startUpdate(); }, + destroy: function() { + var me = this; + me.rstore.stopUpdate(); + }, itemdblclick: function() { var me = this; me.run_editor(); @@ -188,13 +173,21 @@ 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 = { + cicustom: { + header: gettext('Custom Config'), + iconCls: 'fa fa-cogs', + editor: undefined, + never_delete: true, + defaultValue: '', + }, ciuser: { header: gettext('User'), iconCls: 'fa fa-user', @@ -239,6 +232,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', @@ -288,35 +288,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