look for kvm hosts only, fix unit test

Author: sudo87

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -2053,13 +2053,11 @@ void persistDomainForKVM(VMInstanceVO vm) {
         UnmanageInstanceCommand unmanageInstanceCommand;
         if (State.Stopped.equals(vm.getState())) {
             Pair<Long, Long> clusterAndHostId = findClusterAndHostIdForVm(vm.getLastHostId());
-            Long clusterId = clusterAndHostId.first();
             hostId = clusterAndHostId.second();
             if (hostId == null) {
                 logger.debug("No previous host found for Instance: {}. " +
-                        "Searching for any available hosts in cluster with ID: {}.", vmName, clusterId);
-                 List<HostVO> availableHosts = _resourceMgr.listAllUpAndEnabledHosts(Host.Type.Routing, clusterId,
-                         null, vm.getDataCenterId());
+                        "Searching for any available hosts in Zone with ID: {}.", vmName, vm.getDataCenterId());
+                List <HostVO> availableHosts = _hostDao.listByDataCenterIdAndHypervisorType(vm.getDataCenterId(), HypervisorType.KVM);
                  if (availableHosts.isEmpty()) {
                      String errorMsg = "No available host to persist domainXML for Instance: " + vmName;
                      logger.debug(errorMsg);
@@ -2071,6 +2069,7 @@ void persistDomainForKVM(VMInstanceVO vm) {
         } else {
             unmanageInstanceCommand = new UnmanageInstanceCommand(vmName);
         }
+        logger.debug("Selected host with ID: {} to persist domain XML for Instance: {}.", hostId, vmName);
         try {
             Answer answer = _agentMgr.send(hostId, unmanageInstanceCommand);
             if (!answer.getResult()) {

engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java

@@ -1771,6 +1771,7 @@ public void testPersistDomainForKvmForStoppedVmSuccess() throws AgentUnavailable
         doReturn(vmTO).when(virtualMachineManagerImpl).prepVmSpecForUnmanageCmd(vmInstanceVoMockId, 1L);
         UnmanageInstanceAnswer successAnswer = new UnmanageInstanceAnswer(null, true, "success");
         when(agentManagerMock.send(anyLong(), any(UnmanageInstanceCommand.class))).thenReturn(successAnswer);
+        when(virtualMachineManagerImpl.findClusterAndHostIdForVm(vmInstanceVoMockId)).thenReturn(new Pair<>(1L, 1L));
         virtualMachineManagerImpl.persistDomainForKVM(vmInstanceMock);
         ArgumentCaptor<Long> hostIdCaptor = ArgumentCaptor.forClass(Long.class);
         ArgumentCaptor<UnmanageInstanceCommand> commandCaptor = ArgumentCaptor.forClass(UnmanageInstanceCommand.class);
@@ -1783,6 +1784,41 @@ public void testPersistDomainForKvmForStoppedVmSuccess() throws AgentUnavailable
         verify(virtualMachineManagerImpl).prepVmSpecForUnmanageCmd(vmInstanceVoMockId, 1L);
     }
 
+
+    @Test
+    public void testPersistDomainForKvmForStoppedVmHostRemoved() throws AgentUnavailableException, OperationTimedoutException {
+        when(vmInstanceMock.getState()).thenReturn(VirtualMachine.State.Stopped);
+        when(vmInstanceMock.getLastHostId()).thenReturn(1L);
+        when(vmInstanceMock.getDataCenterId()).thenReturn(zoneMockId);
+        VirtualMachineTO vmTO = new VirtualMachineTO() {};
+        vmTO.setName(vmName);
+        doReturn(vmTO).when(virtualMachineManagerImpl).prepVmSpecForUnmanageCmd(vmInstanceVoMockId, 1L);
+        UnmanageInstanceAnswer successAnswer = new UnmanageInstanceAnswer(null, true, "success");
+        when(agentManagerMock.send(anyLong(), any(UnmanageInstanceCommand.class))).thenReturn(successAnswer);
+        when(virtualMachineManagerImpl.findClusterAndHostIdForVm(vmInstanceVoMockId)).thenReturn(new Pair<>(clusterMockId, null));
+        when(hostDaoMock.listByDataCenterIdAndHypervisorType(zoneMockId, HypervisorType.KVM)).thenReturn(List.of(hostMock));
+        virtualMachineManagerImpl.persistDomainForKVM(vmInstanceMock);
+        ArgumentCaptor<Long> hostIdCaptor = ArgumentCaptor.forClass(Long.class);
+        ArgumentCaptor<UnmanageInstanceCommand> commandCaptor = ArgumentCaptor.forClass(UnmanageInstanceCommand.class);
+        verify(agentManagerMock).send(hostIdCaptor.capture(), commandCaptor.capture());
+        assertEquals(1L, hostIdCaptor.getValue().longValue());
+        UnmanageInstanceCommand sentCommand = commandCaptor.getValue();
+        assertNotNull(sentCommand.getVm());
+        assertEquals(vmTO, sentCommand.getVm());
+        assertEquals(vmName, sentCommand.getInstanceName());
+        verify(virtualMachineManagerImpl).prepVmSpecForUnmanageCmd(vmInstanceVoMockId, 1L);
+    }
+
+    @Test
+    public void testPersistDomainForKvmForStoppedVmNoHost() throws AgentUnavailableException, OperationTimedoutException {
+        when(vmInstanceMock.getState()).thenReturn(VirtualMachine.State.Stopped);
+        when(vmInstanceMock.getLastHostId()).thenReturn(1L);
+        VirtualMachineTO vmTO = new VirtualMachineTO() {};
+        vmTO.setName(vmName);
+        CloudRuntimeException exception = assertThrows(CloudRuntimeException.class, () -> virtualMachineManagerImpl.persistDomainForKVM(vmInstanceMock));
+        assertEquals("No available host to persist domainXML for Instance: " + vmName, exception.getMessage());
+    }
+
     @Test
     public void testPersistDomainForKvmForRunningVmAgentFailure() throws AgentUnavailableException, OperationTimedoutException {
         when(vmInstanceMock.getState()).thenReturn(VirtualMachine.State.Running);