ACM-24107 add search fields (#5006)

* Inflate additional VM and VMI fields

Signed-off-by: Kevin Cormier <kcormier@redhat.com>

* Update test case

Signed-off-by: Kevin Cormier <kcormier@redhat.com>

* Fix CPU metric data types

Signed-off-by: Kevin Cormier <kcormier@redhat.com>

* Update test to catch CPU type problem

Signed-off-by: Kevin Cormier <kcormier@redhat.com>

---------

Signed-off-by: Kevin Cormier <kcormier@redhat.com>

Author: KevinFCormier

frontend/packages/multicluster-sdk/src/api/useFleetSearchPoll.test.ts

@@ -471,14 +471,15 @@ describe('useFleetSearchPoll', () => {
         ...mockSearchResultItem,
         kind: 'VirtualMachine',
         apigroup: 'kubevirt.io',
-        cpu: 2,
+        cpu: '2',
         memory: '4Gi',
         ready: 'True',
         status: 'Running',
         flavor: 'test',
         osName: 'rhel',
         workload: 'app',
         runStrategy: 'Always',
+        architecture: 'amd64',
         condition: 'Ready=True; AgentConnected=True',
         dataVolumeNames: 'test-volume1; test-volume2',
         pvcClaimNames: 'test-claim1; test-claim2',
@@ -505,6 +506,7 @@ describe('useFleetSearchPoll', () => {
         runStrategy: 'Always',
         template: {
           spec: {
+            architecture: 'amd64',
             domain: {
               cpu: { cores: 2 },
               memory: { guest: '4Gi' },
@@ -615,6 +617,10 @@ describe('useFleetSearchPoll', () => {
         ...mockSearchResultItem,
         kind: 'VirtualMachineInstance',
         apigroup: 'kubevirt.io',
+        cpu: '4',
+        cpuSockets: '2',
+        cpuThreads: '2',
+        memory: '8Gi',
         liveMigratable: 'True',
         ready: 'True',
         ipaddress: '10.0.0.1',
@@ -640,6 +646,16 @@ describe('useFleetSearchPoll', () => {
       const { result } = renderHook(() => useFleetSearchPoll<any[]>(watchOptionsVMI))
 
       const [data] = result.current
+      expect(data?.[0].spec).toEqual({
+        domain: {
+          cpu: {
+            cores: 4,
+            sockets: 2,
+            threads: 2,
+          },
+          memory: { guest: '8Gi' },
+        },
+      })
       expect(data?.[0].status).toEqual({
         conditions: [
           { type: 'LiveMigratable', status: 'True' },

frontend/packages/multicluster-sdk/src/api/useFleetSearchPoll.ts

@@ -290,7 +290,8 @@ export function useFleetSearchPoll<T extends K8sResourceCommon | K8sResourceComm
 
           case 'VirtualMachine.kubevirt.io': {
             setIfDefined(resource, 'spec.runStrategy', item.runStrategy)
-            setIfDefined(resource, 'spec.template.spec.domain.cpu.cores', item.cpu)
+            setIfDefined(resource, 'spec.template.spec.architecture', item.architecture)
+            setIfDefined(resource, 'spec.template.spec.domain.cpu.cores', item.cpu, Number(item.cpu))
             setIfDefined(resource, 'spec.template.spec.domain.memory.guest', item.memory)
             setIfDefined(resource, 'spec.template.metadata.annotations["vm.kubevirt.io/flavor"]', item.flavor)
             setIfDefined(resource, 'spec.template.metadata.annotations["vm.kubevirt.io/os"]', item.osName)
@@ -334,7 +335,9 @@ export function useFleetSearchPoll<T extends K8sResourceCommon | K8sResourceComm
           }
 
           case 'VirtualMachineInstance.kubevirt.io': {
-            setIfDefined(resource, 'spec.domain.cpu.cores', item.cpu)
+            setIfDefined(resource, 'spec.domain.cpu.cores', item.cpu, Number(item.cpu))
+            setIfDefined(resource, 'spec.domain.cpu.sockets', item.cpuSockets, Number(item.cpuSockets))
+            setIfDefined(resource, 'spec.domain.cpu.threads', item.cpuThreads, Number(item.cpuThreads))
             setIfDefined(resource, 'spec.domain.memory.guest', item.memory)
             if (!resource.status?.conditions) {
               const conditions: any = []