Merge pull request #2614 from pcbailey/bug-cpu-helper-text-incorrect-when-threads-arent-set

CNV-56688: Avoid CPU helper text error if CPU threads is undefined

Author: openshift-merge-bot[bot]

src/utils/components/CPUMemoryModal/components/CPUInput/components/CPUTopologyInput/components/TotalCPUHelperText/CPUTopologyHelperText.tsx

@@ -15,7 +15,8 @@ const CPUTopologyHelperText: FC<CPUTopologyHelperTextProps> = ({ cpu }) => {
   const { t } = useKubevirtTranslation();
   const { cores, sockets, threads } = cpu || {};
 
-  const totalCPU = cores * sockets * threads;
+  // VMs migrated from vSphere may not have spec.template.spec.domain.cpu.threads set
+  const totalCPU = cores * sockets * (threads || 1);
 
   return (
     <div className="cpu-topology-helper-text">

src/utils/components/CPUMemoryModal/components/CPUInput/utils/utils.ts

@@ -16,7 +16,8 @@ export const getUpdatedCPU = (cpu: V1CPU, newValue: number, fieldChanged: CPUCom
 };
 
 export const convertTopologyToVCPUs = (cpu: V1CPU): number =>
-  cpu?.cores * cpu?.sockets * cpu?.threads;
+  // VMs migrated from vSphere may not have spec.template.spec.domain.cpu.threads set
+  cpu?.cores * cpu?.sockets * (cpu?.threads || 1);
 
 export const formatVCPUsAsSockets = (cpu: V1CPU): V1CPU => {
   const numVCPUs = convertTopologyToVCPUs(cpu);

src/utils/resources/template/utils/flavor.ts

@@ -26,7 +26,9 @@ export const parseCPU = (cpu: V1CPU): V1CPU => {
  */
 export const vCPUCount = (cpu: V1CPU): number => {
   const parsedCpu = parseCPU(cpu);
-  return parsedCpu.sockets * parsedCpu.cores * parsedCpu.threads;
+
+  // VMs migrated from vSphere may not have spec.template.spec.domain.cpu.threads set
+  return parsedCpu.sockets * parsedCpu.cores * (parsedCpu.threads || 1);
 };
 
 /**