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 25E349B5AF for ; Mon, 20 Nov 2023 17:29:10 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 06A091CC74 for ; Mon, 20 Nov 2023 17:28:40 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Mon, 20 Nov 2023 17:28:38 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id 364752C2B4D; Mon, 20 Nov 2023 17:28:38 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Mon, 20 Nov 2023 17:28:33 +0100 Message-Id: <20231120162833.431139-3-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120162833.431139-1-s.hanreich@proxmox.com> References: <20231120162833.431139-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -1.972 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLACK 3 Contains an URL listed in the URIBL blacklist [data.zone] Subject: [pve-devel] [PATCH pve-manager 2/2] sdn: Update IPAM API endpoints 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, 20 Nov 2023 16:29:10 -0000 The IPAM-related API endpoints were moved, reflect those changes in the UI as well. Signed-off-by: Stefan Hanreich --- www/manager6/sdn/IpamEdit.js | 4 +++- www/manager6/tree/DhcpTree.js | 15 +++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/www/manager6/sdn/IpamEdit.js b/www/manager6/sdn/IpamEdit.js index 18e22c592..73e5d2e1a 100644 --- a/www/manager6/sdn/IpamEdit.js +++ b/www/manager6/sdn/IpamEdit.js @@ -52,8 +52,10 @@ Ext.define('PVE.sdn.IpamEdit', { isCreate: false, mapping: {}, + url: '/cluster/sdn/vnets', + submitUrl: function(url, values) { - return `${url}/${values.zone}/${values.vnet}/${values.mac}`; + return `${url}/${values.vnet}/ips`; }, initComponent: function() { diff --git a/www/manager6/tree/DhcpTree.js b/www/manager6/tree/DhcpTree.js index ca279c29a..b7baba606 100644 --- a/www/manager6/tree/DhcpTree.js +++ b/www/manager6/tree/DhcpTree.js @@ -17,7 +17,7 @@ Ext.define('PVE.sdn.DhcpTree', { let me = this; Proxmox.Utils.API2Request({ - url: `/cluster/sdn/ipam`, + url: `/cluster/sdn/ipams/pve/status`, method: 'GET', success: function(response, opts) { let root = { @@ -105,8 +105,17 @@ Ext.define('PVE.sdn.DhcpTree', { return; } + let params = { + zone: data.zone, + mac: data.mac, + }; + + let encodedParams = Ext.Object.toQueryString(params); + + let url = `/cluster/sdn/vnets/${data.vnet}/ips?${encodedParams}`; + Proxmox.Utils.API2Request({ - url: `/cluster/sdn/ipam/${data.zone}/${data.vnet}/${data.mac}`, + url, method: 'DELETE', waitMsgTarget: view, failure: function(response, opts) { @@ -149,7 +158,6 @@ Ext.define('PVE.sdn.DhcpTree', { Ext.create('PVE.sdn.IpamEdit', { autoShow: true, mapping: data, - url: `/cluster/sdn/ipam`, extraRequestParams: { vmid: data.vmid, mac: data.mac, @@ -217,7 +225,6 @@ Ext.define('PVE.sdn.DhcpTree', { Ext.create('PVE.sdn.IpamEdit', { autoShow: true, mapping: {}, - url: `/cluster/sdn/ipam`, isCreate: true, extraRequestParams: { vnet: data.name, -- 2.39.2