populate processor types from config values

Signed-off-by: Arthur Lu <learthurgo@gmail.com>

scripts/account.js

@@ -26,13 +26,13 @@ async function init() {
 		goToPage("login.html");
 	}
 	let resources = await requestAPI("/user/resources");
-	let instances = await requestAPI("/user/instances");
+	let instances = await requestAPI("/user/config/instances");
-	let nodes = await requestAPI("/user/nodes");
+	let nodes = await requestAPI("/user/config/nodes");
 	document.querySelector("#username").innerText = `Username: ${getCookie("username")}`;
 	document.querySelector("#pool").innerText = `Pool: ${instances.pool}`;
 	document.querySelector("#vmid").innerText = `VMID Range: ${instances.vmid.min} - ${instances.vmid.max}`;
 	document.querySelector("#vlan").innerText = `VLAN Tag: ${instances.vlan}`;
-	document.querySelector("#nodes").innerText = `Nodes: ${nodes.nodes.toString()}`;
+	document.querySelector("#nodes").innerText = `Nodes: ${nodes.toString()}`;
 	buildResourceTable(resources, "#resource-table");
 }
 

scripts/config.js

@@ -43,11 +43,28 @@ async function getConfig() {
 	config = await requestPVE(`/nodes/${node}/${type}/${vmid}/config`, "GET");
 }
 
-function populateResources() {
+async function populateResources() {
 	let name = type === "qemu" ? "name" : "hostname";
 	document.querySelector("#name").innerHTML = document.querySelector("#name").innerHTML.replace("%{vmname}", config.data[name]);
 	if (type === "qemu") {
-		addResourceLine("resources", "images/resources/cpu.svg", "select", "Processors Type", "proctype", { value: config.data.cpu, options: ["host", "kvm64"] });
+		let global = await requestAPI("/global/config/resources");
+		let user = await requestAPI("/user/config/resources");
+		let options = [];
+		if (global.cpu.whitelist) {
+			options = user.max.cpu.sort((a,b) => {return a.localeCompare(b)});
+		}
+		else {
+			let supported = await requestPVE(`/nodes/${node}/capabilities/qemu/cpu`);
+			supported.data.forEach((element) => {
+				if (!user.max.cpu.includes(element.name)) {
+					options.push(element.name);
+				}
+			});
+			options = options.sort((a,b) => {return a.localeCompare(b)})
+			console.log(options);
+			console.log("blacklist not yet supported")
+		}
+		addResourceLine("resources", "images/resources/cpu.svg", "select", "Processors Type", "proctype", { value: config.data.cpu, options: options });
 	}
 	addResourceLine("resources", "images/resources/cpu.svg", "input", "Processors Amount", "cores", { type: "number", value: config.data.cores, min: 1, max: 8192 }, "Cores");
 	addResourceLine("resources", "images/resources/ram.svg", "input", "Memory", "ram", { type: "number", value: config.data.memory, min: 16, step: 1 }, "MiB");
@@ -107,7 +124,7 @@ function addResourceLine(fieldset, iconHref, type, labelText, id, attributes, un
 	}
 }
 
-function populateDisk() {
+async function populateDisk() {
 	document.querySelector("#disks").innerHTML = "";
 	for (let i = 0; i < diskMetaData[type].prefixOrder.length; i++) {
 		let prefix = diskMetaData[type].prefixOrder[i];
@@ -457,7 +474,7 @@ async function handleCDAdd() {
 	});
 }
 
-function populateNetworks() {
+async function populateNetworks() {
 	document.querySelector("#networks").innerHTML = "";
 	let networks = {};
 	let prefix = networkMetaData.prefix;
@@ -614,7 +631,7 @@ async function handleNetworkAdd() {
 	});
 }
 
-function populateDevices() {
+async function populateDevices() {
 	if (type === "qemu") {
 		document.querySelector("#devices-card").classList.remove("none");
 		document.querySelector("#devices").innerHTML = "";

scripts/index.js

@@ -154,9 +154,9 @@ async function handleInstanceAdd() {
 
 	let nodeSelect = d.querySelector("#node");
 	let clusterNodes = await requestPVE("/nodes", "GET");
-	let allowedNodes = await requestAPI("/user/nodes", "GET");
+	let allowedNodes = await requestAPI("/user/config/nodes", "GET");
 	clusterNodes.data.forEach((element) => {
-		if (element.status === "online" && allowedNodes.nodes.includes(element.node)) {
+		if (element.status === "online" && allowedNodes.includes(element.node)) {
 			nodeSelect.add(new Option(element.node));
 		}
 	});
@@ -190,7 +190,7 @@ async function handleInstanceAdd() {
 	});
 
 	let userResources = await requestAPI("/user/resources", "GET");
-	let userInstances = await requestAPI("/user/instances", "GET");
+	let userInstances = await requestAPI("/user/config/instances", "GET");
 	d.querySelector("#cores").max = userResources.avail.cores;
 	d.querySelector("#memory").max = userResources.avail.memory;
 	d.querySelector("#vmid").min = userInstances.vmid.min;