fix

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java

@@ -19,6 +19,7 @@
 import static org.apache.cloudstack.framework.config.ConfigKey.Scope.Zone;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -134,7 +135,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements Configur
             "Enable/Disable alerts for the VM HA operations, it is enabled by default.", true, Zone);
 
     protected static final List<ReasonType> CancellableWorkReasonTypes =
-            List.of(ReasonType.HostMaintenance, ReasonType.HostDown, ReasonType.HostDegraded);
+            Arrays.asList(ReasonType.HostMaintenance, ReasonType.HostDown, ReasonType.HostDegraded);
 
     WorkerThread[] _workers;
     boolean _stopped;
@@ -789,7 +790,6 @@ protected boolean checkAndCancelWorkIfNeeded(final HaWorkVO work) {
         if (!CancellableWorkReasonTypes.contains(work.getReasonType())) {
             return false;
         }
-
         Status hostStatus = investigate(work.getHostId());
         if (!Status.Up.equals(hostStatus)) {
             return false;

server/src/test/java/com/cloud/ha/HighAvailabilityManagerImplTest.java

@@ -449,15 +449,24 @@ public void testCheckAndCancelWorkIfNeeded_StepNotInvestigating() {
         Mockito.verify(mockWork, Mockito.never()).setStep(Mockito.any());
     }
 
-    @Test
-    public void testCheckAndCancelWorkIfNeeded_InvalidReasonType() {
+    private void runInvalidReasonCheckAndCancelWorkIfNeeded(HighAvailabilityManager.ReasonType reasonType) {
         Mockito.when(mockWork.getStep()).thenReturn(Step.Investigating);
-        Mockito.when(mockWork.getReasonType()).thenReturn(HighAvailabilityManager.ReasonType.Unknown);
+        Mockito.when(mockWork.getReasonType()).thenReturn(reasonType);
         boolean result = highAvailabilityManagerSpy.checkAndCancelWorkIfNeeded(mockWork);
         assertFalse(result);
         Mockito.verify(mockWork, Mockito.never()).setStep(Mockito.any());
     }
 
+    @Test
+    public void testCheckAndCancelWorkIfNeeded_InvalidReasonType() {
+        runInvalidReasonCheckAndCancelWorkIfNeeded(HighAvailabilityManager.ReasonType.Unknown);
+    }
+
+    @Test
+    public void testCheckAndCancelWorkIfNeeded_NullReasonType() {
+        runInvalidReasonCheckAndCancelWorkIfNeeded(null);
+    }
+
     @Test
     public void testCheckAndCancelWorkIfNeeded_HostStatusNotUp() {
         Mockito.when(mockWork.getStep()).thenReturn(Step.Investigating);