better status tests

openshift · Jan 22, 2020 · 0cc4846 · 0cc4846
1 parent 07e5138
commit 0cc4846
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/frontend/packages/kubevirt-plugin/src/statuses/vm/vm.ts b/frontend/packages/kubevirt-plugin/src/statuses/vm/vm.ts
@@ -247,12 +247,12 @@ export const getVMStatus = ({
     isV2VConversion(vmLike, pods) || // these statuses must precede isRunning() because they do not rely on ready vms
     isBeingMigrated(vmLike, migrations) || //  -||-
     (vm && isBeingImported(vm, pods)) || //  -||-
-    (vm && isBeingStopped(vm, launcherPod)) ||
+    (vmi && isBeingStopped(vm, launcherPod)) ||
     (vm && isOff(vm)) ||
     isReady(vmi, launcherPod) ||
     isVMError(vmLike) ||
-    isCreated(vmLike, launcherPod) ||
-    (vm && isWaitingForVMI(vm)) ||
+    (vmi && isCreated(vmLike, launcherPod)) ||
+    (!vmi && vm && isWaitingForVMI(vm)) ||
     (getPhase(vmi) === 'Running' && { status: VM_STATUS_RUNNING }) ||
     (['Scheduling', 'Scheduled'].includes(getPhase(vmi)) && { status: VM_STATUS_STARTING }) ||
     (getPhase(vmi) === 'Pending' && { status: VM_STATUS_VMI_WAITING }) ||