WIP: CNV-38502: Allow changing CPU and memory when Dedicated resources is enabled

src/utils/components/CPUMemoryModal/CPUMemoryModal.tsx

@@ -8,9 +8,19 @@ import MemoryInput from '@kubevirt-utils/components/CPUMemoryModal/components/Me
 import { DEFAULT_NAMESPACE } from '@kubevirt-utils/constants/constants';
 import { useKubevirtTranslation } from '@kubevirt-utils/hooks/useKubevirtTranslation';
 import { getLabel } from '@kubevirt-utils/resources/shared';
-import { getCPUSockets, getMemory, VM_TEMPLATE_ANNOTATION } from '@kubevirt-utils/resources/vm';
+import {
+  getCPU,
+  getCPULimit,
+  getCPURequest,
+  getCPUSockets,
+  getMemory,
+  getMemoryLimit,
+  getMemoryRequest,
+  VM_TEMPLATE_ANNOTATION,
+} from '@kubevirt-utils/resources/vm';
 import { ensurePath } from '@kubevirt-utils/utils/utils';
 import { Alert, Button, ButtonVariant, Modal, ModalVariant } from '@patternfly/react-core';
+import { updateVMResources } from '@virtualmachines/details/tabs/configuration/details/utils/utils';
 
 import useTemplateDefaultCpuMemory from './hooks/useTemplateDefaultCpuMemory';
 import { getMemorySize } from './utils/CpuMemoryUtils';
@@ -59,8 +69,21 @@ const CPUMemoryModal: FC<CPUMemoryModalProps> = ({
         'spec.template.spec.domain.memory.guest',
       ]);
 
+      const memoryValue = `${memory}${memoryUnit}`;
+      const numCPUs = cpuSockets * getCPU(vm)?.cores * getCPU(vm)?.threads;
+
       vmDraft.spec.template.spec.domain.cpu.sockets = cpuSockets;
       vmDraft.spec.template.spec.domain.memory.guest = `${memory}${memoryUnit}`;
+
+      if (getMemoryRequest(vmDraft) && getMemoryLimit(vmDraft)) {
+        vmDraft.spec.template.spec.domain.resources.requests['memory'] = memoryValue;
+        vmDraft.spec.template.spec.domain.resources.limits['memory'] = memoryValue;
+      }
+
+      if (getCPURequest(vmDraft) && getCPULimit(vmDraft)) {
+        vmDraft.spec.template.spec.domain.resources.requests['memory'] = numCPUs;
+        vmDraft.spec.template.spec.domain.resources.limits['memory'] = numCPUs;
+      }
     });
 
     return updatedVM;
@@ -80,6 +103,7 @@ const CPUMemoryModal: FC<CPUMemoryModalProps> = ({
     setUpdateError(null);
 
     try {
+      await updateVMResources(updatedVirtualMachine);
       await onSubmit(updatedVirtualMachine);
 
       setUpdateInProcess(false);

src/utils/resources/vm/utils/selectors.ts

@@ -187,8 +187,17 @@ export const getAutoAttachPodInterface = (vm: V1VirtualMachine): boolean =>
 export const getDomain = <T extends Record<string, any>>(obj: T): V1DomainSpec =>
   obj?.spec?.domain || obj?.spec?.template?.spec?.domain;
 
+export const getMemoryLimit = <T>(obj: T): string => getDomain(obj)?.resources?.limits?.['memory'];
+
+export const getMemoryRequest = <T>(obj: T): string =>
+  getDomain(obj)?.resources?.requests?.['memory'];
+
 export const getMemory = <T>(obj: T): string =>
-  getDomain(obj)?.memory?.guest || getDomain(obj)?.resources?.requests?.['memory'];
+  getDomain(obj)?.memory?.guest || getMemoryRequest(obj);
+
+export const getCPULimit = <T>(obj: T): V1CPU => getDomain(obj)?.resources?.limits?.['cpu'];
+
+export const getCPURequest = <T>(obj: T): string => getDomain(obj)?.resources?.requests?.['cpu'];
 
 export const getCPU = <T>(obj: T): V1CPU => getDomain(obj)?.cpu;
 

src/views/virtualmachines/details/tabs/configuration/details/DetailsSection.tsx

@@ -36,10 +36,10 @@ import DetailsSectionBoot from './components/DetailsSectionBoot';
 import DetailsSectionHardware from './components/DetailsSectionHardware';
 import {
   updateDescription,
-  updatedHostname,
-  updatedVirtualMachine,
   updateGuestSystemAccessLog,
   updateHeadlessMode,
+  updateHostname,
+  updateVirtualMachine,
   updateWorkload,
 } from './utils/utils';
 
@@ -141,7 +141,7 @@ const DetailsSection: FC<DetailsSectionProps> = ({ instanceTypeVM, vm, vmi }) =>
                   <CPUMemoryModal
                     isOpen={isOpen}
                     onClose={onClose}
-                    onSubmit={updatedVirtualMachine}
+                    onSubmit={updateVirtualMachine}
                     vm={vm}
                   />
                 ))
@@ -160,7 +160,7 @@ const DetailsSection: FC<DetailsSectionProps> = ({ instanceTypeVM, vm, vmi }) =>
                   <HostnameModal
                     isOpen={isOpen}
                     onClose={onClose}
-                    onSubmit={updatedHostname}
+                    onSubmit={updateHostname}
                     vm={vm}
                     vmi={vmi}
                   />

src/views/virtualmachines/details/tabs/configuration/details/utils/utils.ts

@@ -170,7 +170,35 @@ export const updateWorkload = (updatedVM: V1VirtualMachine, newWorkload: WORKLOA
   });
 };
 
-export const updatedVirtualMachine = (updatedVM: V1VirtualMachine) =>
+export const updateVMResources = (updatedVM: V1VirtualMachine) =>
+  k8sPatch({
+    data: [
+      {
+        op: 'replace',
+        path: `/spec/template/spec/domain/resources/limits/cpu`,
+        value: getCPUSockets(updatedVM),
+      },
+      {
+        op: 'replace',
+        path: `/spec/template/spec/domain/resources/requests/cpu`,
+        value: getCPUSockets(updatedVM),
+      },
+      {
+        op: 'replace',
+        path: `/spec/template/spec/domain/resources/limits/memory`,
+        value: getMemory(updatedVM),
+      },
+      {
+        op: 'replace',
+        path: `/spec/template/spec/domain/resources/requests/memory`,
+        value: getMemory(updatedVM),
+      },
+    ],
+    model: VirtualMachineModel,
+    resource: updatedVM,
+  });
+
+export const updateVirtualMachine = (updatedVM: V1VirtualMachine) =>
   k8sPatch({
     data: [
       {
@@ -188,7 +216,7 @@ export const updatedVirtualMachine = (updatedVM: V1VirtualMachine) =>
     resource: updatedVM,
   });
 
-export const updatedHostname = (updatedVM: V1VirtualMachine) =>
+export const updateHostname = (updatedVM: V1VirtualMachine) =>
   k8sPatch({
     data: [
       {