mnl/VM-Operator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

Handle maximum CPUs properly.

Browse source
This commit is contained in:
Michael Lipp 2023-11-03 22:13:48 +01:00
parent 91a9c8605c
commit 4122fa25d2
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-view.ftl.html
View file

@ -70,7 +70,7 @@
<table class="table--basic table--basic--autoStriped">
<tr>
<td>{{ localize("maximumCpus") }}</td>
<td>{{ entry.spec.vm.maximumCpus }}</td>
<td>{{ maximumCpus(entry) }}</td>
</tr>
<tr>
<td>{{ localize("requestedCpus") }}</td>

13
org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/VmConlet-functions.ts
View file

@ -147,9 +147,22 @@ window.orgJDrupesVmOperatorVmConlet.initView = (viewDom: HTMLElement,
const cic = new ConditionlInputController(submitCallback);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const maximumCpus = (vmDef: any) => {
if (vmDef.spec.vm["maximumCpus"]) {
return vmDef.spec.vm.maximumCpus;
}
const topo = vmDef.spec.vm.cpuTopology;
return Math.max(1, topo.coresPerDie)
* Math.max(1, topo.diesPerSocket)
* Math.max(1, topo.sockets)
* Math.max(1, topo.threadsPerCore);
}
return {
controller, vmInfos, filteredData, detailsByName, localize,
shortDateTime, formatMemory, vmAction, cic, parseMemory,
maximumCpus,
scopedId: (id: string) => { return idScope.scopedId(id); }
};
}