Fix for UT failures

Author: abh1sar

engine/schema/src/test/java/org/apache/cloudstack/backup/dao/BackupDaoImplTest.java

@@ -16,6 +16,9 @@
 // under the License.
 package org.apache.cloudstack.backup.dao;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -40,6 +43,9 @@
 import com.cloud.domain.DomainVO;
 import com.cloud.domain.dao.DomainDao;
 import com.cloud.hypervisor.Hypervisor;
+import com.cloud.storage.Storage;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.user.AccountVO;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.db.SearchBuilder;
@@ -74,6 +80,9 @@ public class BackupDaoImplTest {
     @Mock
     BackupOfferingDao backupOfferingDao;
 
+    @Mock
+    private VMTemplateDao templateDao;
+
     @Test
     public void testLoadDetails() {
         Long backupId = 1L;
@@ -115,6 +124,9 @@ public void testNewBackupResponse() {
         Long vmOfferingId = 5L;
         Long backupOfferingId = 6L;
         Long backupId = 7L;
+        Long templateId = 8L;
+        String templateUuid = "template-uuid1";
+
         BackupVO backup = new BackupVO();
         ReflectionTestUtils.setField(backup, "id", backupId);
         ReflectionTestUtils.setField(backup, "uuid", "backup-uuid");
@@ -130,6 +142,7 @@ public void testNewBackupResponse() {
                 0L, Hypervisor.HypervisorType.Simulator, 0L, domainId, accountId, 0L, false);
         vm.setDataCenterId(zoneId);
         vm.setBackupOfferingId(vmOfferingId);
+        vm.setTemplateId(templateId);
 
         AccountVO account = new AccountVO();
         account.setUuid("account-uuid");
@@ -152,8 +165,12 @@ public void testNewBackupResponse() {
         Mockito.when(dataCenterDao.findByIdIncludingRemoved(zoneId)).thenReturn(zone);
         Mockito.when(backupOfferingDao.findByIdIncludingRemoved(backupOfferingId)).thenReturn(offering);
 
+        VMTemplateVO template = mock(VMTemplateVO.class);
+        when(template.getFormat()).thenReturn(Storage.ImageFormat.QCOW2);
+        when(template.getUuid()).thenReturn(templateUuid);
+        when(templateDao.findById(templateId)).thenReturn(template);
         Map<String, String> details = new HashMap<>();
-        details.put(ApiConstants.HYPERVISOR, String.valueOf(Hypervisor.HypervisorType.KVM));
+
         Mockito.when(backupDetailsDao.listDetailsKeyPairs(backup.getId(), true)).thenReturn(details);
 
         BackupResponse response = backupDao.newBackupResponse(backup, true);
@@ -169,7 +186,7 @@ public void testNewBackupResponse() {
         Assert.assertEquals("offering-uuid", response.getBackupOfferingId());
         Assert.assertEquals("test-offering", response.getBackupOffering());
         Assert.assertEquals("MANUAL", response.getIntervalType());
-        Assert.assertEquals("{hypervisor=KVM}", response.getVmDetails().toString());
+        Assert.assertEquals("{isiso=false, hypervisor=Simulator, templateid=template-uuid1}", response.getVmDetails().toString());
         Assert.assertEquals(true, response.getVmOfferingRemoved());
     }
 }

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -9058,7 +9058,7 @@ public UserVm allocateVMFromBackup(CreateVMFromBackupCmd cmd) throws Insufficien
 
         verifyDetails(cmd.getDetails());
 
-        VMInstanceVO backupVm = _vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
+        UserVmVO backupVm = _vmDao.findByIdIncludingRemoved(backup.getVmId());
         HypervisorType hypervisorType = backupVm.getHypervisorType();
 
         Long templateId;

server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java

@@ -3183,13 +3183,19 @@ public void testAllocateVMFromBackupUsingCmdValues() throws InsufficientCapacity
         when(diskOffering.isCustomizedIops()).thenReturn(true);
         when(entityManager.findByUuid(DiskOffering.class, "disk-offering-uuid")).thenReturn(diskOffering);
 
-        VMTemplateVO template = mock(VMTemplateVO.class);
-        when(templateDao.findById(templateId)).thenReturn(template);
-
         BackupVO backup = mock(BackupVO.class);
         when(backup.getZoneId()).thenReturn(zoneId);
+        when(backup.getVmId()).thenReturn(vmId);
         when(backupDao.findById(backupId)).thenReturn(backup);
         when(backup.getDetail(ApiConstants.NETWORK_IDS)).thenReturn("network-uuid");
+
+        UserVmVO userVmVO = new UserVmVO();
+        userVmVO.setTemplateId(templateId);
+        when(userVmDao.findByIdIncludingRemoved(vmId)).thenReturn(userVmVO);
+        VMTemplateVO template = mock(VMTemplateVO.class);
+        when(template.getFormat()).thenReturn(Storage.ImageFormat.QCOW2);
+        when(templateDao.findById(templateId)).thenReturn(template);
+
         NetworkVO network = mock(NetworkVO.class);
         when(network.getId()).thenReturn(networkId);
         when(_networkDao.findByUuid("network-uuid")).thenReturn(network);
@@ -3233,18 +3239,22 @@ public void testAllocateVMFromBackupUsingBackupValues() throws InsufficientCapac
 
         BackupVO backup = mock(BackupVO.class);
         when(backup.getZoneId()).thenReturn(zoneId);
+        when(backup.getVmId()).thenReturn(vmId);
         when(backupDao.findById(backupId)).thenReturn(backup);
 
+        UserVmVO userVmVO = new UserVmVO();
+        userVmVO.setTemplateId(templateId);
+        when(userVmDao.findByIdIncludingRemoved(vmId)).thenReturn(userVmVO);
+        VMTemplateVO template = mock(VMTemplateVO.class);
+        when(template.getFormat()).thenReturn(Storage.ImageFormat.QCOW2);
+        when(templateDao.findById(templateId)).thenReturn(template);
+
         DiskOfferingVO diskOffering = mock(DiskOfferingVO.class);
         when(backup.getDetail(ApiConstants.SERVICE_OFFERING_ID)).thenReturn("service-offering-uuid");
         when(_serviceOfferingDao.findByUuid("service-offering-uuid")).thenReturn(serviceOffering);
         when(serviceOffering.getDiskOfferingId()).thenReturn(rootDiskOfferingId);
         when(diskOfferingDao.findById(rootDiskOfferingId)).thenReturn(diskOffering);
 
-        when(backup.getDetail(ApiConstants.TEMPLATE_ID)).thenReturn("template-uuid");
-        VMTemplateVO template = mock(VMTemplateVO.class);
-        when(templateDao.findByUuid("template-uuid")).thenReturn(template);
-
         when(backup.getDetail(ApiConstants.NETWORK_IDS)).thenReturn("net1-uuid,net2-uuid");
         NetworkVO network1 = mock(NetworkVO.class);
         NetworkVO network2 = mock(NetworkVO.class);

server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java

@@ -770,29 +770,21 @@ public void testBackupSyncTask() {
     public void testGetVmDetailsForBackup() {
         Long vmId = 1L;
         VirtualMachine vm = mock(VirtualMachine.class);
-        when(vm.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
         when(vm.getServiceOfferingId()).thenReturn(1L);
-        when(vm.getTemplateId()).thenReturn(1L);
         when(vm.getId()).thenReturn(vmId);
 
         ServiceOfferingVO serviceOffering = mock(ServiceOfferingVO.class);
         when(serviceOffering.getUuid()).thenReturn("service-offering-uuid");
         when(serviceOfferingDao.findById(1L)).thenReturn(serviceOffering);
 
-        VMTemplateVO template = mock(VMTemplateVO.class);
-        when(template.getUuid()).thenReturn("template-uuid");
-        when(vmTemplateDao.findById(1L)).thenReturn(template);
-
         UserVmJoinVO userVmJoinVO = mock(UserVmJoinVO.class);
         when(userVmJoinVO.getNetworkUuid()).thenReturn("mocked-network-uuid");
         List<UserVmJoinVO> userVmJoinVOs = Collections.singletonList(userVmJoinVO);
         when(userVmJoinDao.searchByIds(vmId)).thenReturn(userVmJoinVOs);
 
         Map<String, String> details = backupManager.getVmDetailsForBackup(vm);
 
-        assertEquals("KVM", details.get(ApiConstants.HYPERVISOR));
         assertEquals("service-offering-uuid", details.get(ApiConstants.SERVICE_OFFERING_ID));
-        assertEquals("template-uuid", details.get(ApiConstants.TEMPLATE_ID));
         assertEquals("mocked-network-uuid", details.get(ApiConstants.NETWORK_IDS));
     }