Better counting of migrated vms

Signed-off-by: yaacov <yzamir@redhat.com>
kubev2v · Jul 18, 2023 · 6b466c2 · 6b466c2
1 parent 288379b
commit 6b466c2
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 10 deletions.
diff --git a/packages/forklift-console-plugin/src/modules/Overview/utils/helpers/getMigrationCounts.ts b/packages/forklift-console-plugin/src/modules/Overview/utils/helpers/getMigrationCounts.ts
@@ -10,6 +10,7 @@ export function getMigrationCounts(migrations: V1beta1Migration[]): { [key: stri
     Total: 0,
     Running: 0,
     Failed: 0,
+    Canceled: 0,
     Succeeded: 0,
   };
 

diff --git a/packages/forklift-console-plugin/src/modules/Overview/utils/helpers/getVmCounts.ts b/packages/forklift-console-plugin/src/modules/Overview/utils/helpers/getVmCounts.ts
@@ -1,5 +1,34 @@
 import { V1beta1Migration } from '@kubev2v/types';
 
+// Helper function to process 'True' vm conditions
+function processVmConditions(vm) {
+  if (!('conditions' in vm)) return [];
+
+  return vm.conditions.reduce((acc: string[], condition) => {
+    if (condition.status === 'True') acc.push(condition.type);
+    return acc;
+  }, []);
+}
+
+// Helper function to increment vmCounts based on conditions
+function incrementCounts(conditions: string[], vm, vmCounts: { [key: string]: number }) {
+  vmCounts['Total']++;
+
+  const isRunning =
+    vm?.phase !== 'Completed' && !conditions.includes('Failed') && !conditions.includes('Canceled');
+  const isCompleted = vm?.phase === 'Completed';
+
+  if (isRunning) {
+    vmCounts['Running']++;
+  }
+
+  if (isCompleted) {
+    conditions.forEach((condition) => {
+      if (condition in vmCounts) vmCounts[condition]++;
+    });
+  }
+}
+
 /**
  * This function gets the number of 'Running', 'Failed', and 'Succeeded' VMs in the migrations.
  * @param {V1beta1Migration[]} migrations - The array of migration objects to inspect.
@@ -10,22 +39,15 @@ export function getVmCounts(migrations: V1beta1Migration[]): { [key: string]: nu
     Total: 0,
     Running: 0,
     Failed: 0,
+    Canceled: 0,
     Succeeded: 0,
   };
 
   for (const migration of migrations || []) {
     if ('vms' in migration.status) {
       for (const vm of migration.status.vms) {
-        vmCounts['Total']++;
-        if ('conditions' in vm) {
-          for (const condition of vm.conditions) {
-            if (condition.status == 'True') {
-              if (condition.type in vmCounts) {
-                vmCounts[condition.type]++;
-              }
-            }
-          }
-        }
+        const conditions = processVmConditions(vm);
+        incrementCounts(conditions, vm, vmCounts);
       }
     }
   }

diff --git a/...-console-plugin/src/modules/Overview/views/overview/tabs/Details/cards/MigrationsCard.tsx b/...-console-plugin/src/modules/Overview/views/overview/tabs/Details/cards/MigrationsCard.tsx
@@ -71,6 +71,7 @@ export const MigrationsCard: React.FC<MigrationsCardProps> = () => {
           />
         </Flex>
 
+        <Text component={TextVariants.small}>{t('{{Canceled}} canceled', count)}</Text>
         <Divider />
       </CardBody>
 
@@ -95,6 +96,7 @@ export const MigrationsCard: React.FC<MigrationsCardProps> = () => {
           />
         </Flex>
 
+        <Text component={TextVariants.small}>{t('{{Canceled}} canceled', vmCount)}</Text>
         <Divider />
       </CardBody>
     </Card>