fix unused aurgument

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

Author: shwstppr

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

@@ -578,7 +578,7 @@ protected Long restart(final HaWorkVO work) {
             logger.info("Unable to find vm: " + vmId);
             return null;
         }
-        if (checkAndCancelWorkIfNeeded(work, vm)) {
+        if (checkAndCancelWorkIfNeeded(work)) {
             return null;
         }
 
@@ -782,7 +782,7 @@ protected Long restart(final HaWorkVO work) {
         return (System.currentTimeMillis() >> 10) + _restartRetryInterval;
     }
 
-    protected boolean checkAndCancelWorkIfNeeded(final HaWorkVO work, final VirtualMachine vm) {
+    protected boolean checkAndCancelWorkIfNeeded(final HaWorkVO work) {
         if (!Step.Investigating.equals(work.getStep())) {
             return false;
         }
@@ -809,7 +809,7 @@ public Long migrate(final HaWorkVO work) {
             logger.info("Unable to find vm: " + vmId + ", skipping migrate.");
             return null;
         }
-        if (checkAndCancelWorkIfNeeded(work, vm)) {
+        if (checkAndCancelWorkIfNeeded(work)) {
             return null;
         }
         logger.info("Migration attempt: for VM {}from host {}. Starting attempt: {}/{} times.", vm, srcHost, 1 + work.getTimesTried(), _maxRetries);
@@ -878,7 +878,7 @@ protected Long destroyVM(final HaWorkVO work) {
             logger.info("No longer can find VM " + work.getInstanceId() + ". Throwing away " + work);
             return null;
         }
-        if (checkAndCancelWorkIfNeeded(work, vm)) {
+        if (checkAndCancelWorkIfNeeded(work)) {
             return null;
         }
         boolean expunge = VirtualMachine.Type.SecondaryStorageVm.equals(vm.getType())
@@ -915,7 +915,7 @@ protected Long stopVM(final HaWorkVO work) throws ConcurrentOperationException {
             work.setStep(Step.Done);
             return null;
         }
-        if (checkAndCancelWorkIfNeeded(work, vm)) {
+        if (checkAndCancelWorkIfNeeded(work)) {
             return null;
         }
         logger.info("Stopping " + vm);

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

@@ -137,8 +137,6 @@ public class HighAvailabilityManagerImplTest {
 
     @Mock
     private HaWorkVO mockWork;
-    @Mock
-    private VirtualMachine mockVm;
 
     HighAvailabilityManagerImpl highAvailabilityManager;
     HighAvailabilityManagerImpl highAvailabilityManagerSpy;
@@ -438,15 +436,15 @@ public void testCheckAndCancelWorkIfNeeded_Success() {
         Mockito.when(mockWork.getHostId()).thenReturn(1L);
         Mockito.doReturn(Status.Up).when(highAvailabilityManagerSpy).investigate(1L);
         Mockito.doNothing().when(mockWork).setStep(Step.Cancelled);
-        boolean result = highAvailabilityManagerSpy.checkAndCancelWorkIfNeeded(mockWork, mockVm);
+        boolean result = highAvailabilityManagerSpy.checkAndCancelWorkIfNeeded(mockWork);
         assertTrue(result);
         Mockito.verify(mockWork).setStep(Step.Cancelled);
     }
 
     @Test
     public void testCheckAndCancelWorkIfNeeded_StepNotInvestigating() {
         Mockito.when(mockWork.getStep()).thenReturn(Step.Cancelled);
-        boolean result = highAvailabilityManagerSpy.checkAndCancelWorkIfNeeded(mockWork, mockVm);
+        boolean result = highAvailabilityManagerSpy.checkAndCancelWorkIfNeeded(mockWork);
         assertFalse(result);
         Mockito.verify(mockWork, Mockito.never()).setStep(Mockito.any());
     }
@@ -455,7 +453,7 @@ public void testCheckAndCancelWorkIfNeeded_StepNotInvestigating() {
     public void testCheckAndCancelWorkIfNeeded_InvalidReasonType() {
         Mockito.when(mockWork.getStep()).thenReturn(Step.Investigating);
         Mockito.when(mockWork.getReasonType()).thenReturn(HighAvailabilityManager.ReasonType.Unknown);
-        boolean result = highAvailabilityManagerSpy.checkAndCancelWorkIfNeeded(mockWork, mockVm);
+        boolean result = highAvailabilityManagerSpy.checkAndCancelWorkIfNeeded(mockWork);
         assertFalse(result);
         Mockito.verify(mockWork, Mockito.never()).setStep(Mockito.any());
     }
@@ -466,7 +464,7 @@ public void testCheckAndCancelWorkIfNeeded_HostStatusNotUp() {
         Mockito.when(mockWork.getReasonType()).thenReturn(HighAvailabilityManager.ReasonType.HostDown);
         Mockito.when(mockWork.getHostId()).thenReturn(1L);
         Mockito.doReturn(Status.Down).when(highAvailabilityManagerSpy).investigate(1L);
-        boolean result = highAvailabilityManagerSpy.checkAndCancelWorkIfNeeded(mockWork, mockVm);
+        boolean result = highAvailabilityManagerSpy.checkAndCancelWorkIfNeeded(mockWork);
         assertFalse(result);
         Mockito.verify(mockWork, Mockito.never()).setStep(Mockito.any());
     }