fix UT failures in BackupManagerTest and UserVmManagerImplTest

Author: abh1sar

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

@@ -1646,13 +1646,12 @@ public void checkExpungeVmPermissionTestAccountIsAdminHasApiAccessReturnNothing
     @Test
     public void testAllocateVMFromBackupUsingCmdValues() throws InsufficientCapacityException, ResourceAllocationException, ResourceUnavailableException {
         Long backupId = 1L;
-        Long diskOfferingId = 2L;
         Long rootDiskOfferingId = 3L;
 
         CreateVMFromBackupCmd cmd = mock(CreateVMFromBackupCmd.class);
         when(cmd.getEntityOwnerId()).thenReturn(accountId);
         when(cmd.getServiceOfferingId()).thenReturn(serviceOfferingId);
-        when(cmd.getDiskOfferingId()).thenReturn(diskOfferingId);
+        when(cmd.getDiskOfferingId()).thenReturn(null);
         when(cmd.getTemplateId()).thenReturn(templateId);
         when(cmd.getZoneId()).thenReturn(zoneId);
         when(cmd.getBackupId()).thenReturn(backupId);
@@ -1664,7 +1663,6 @@ public void testAllocateVMFromBackupUsingCmdValues() throws InsufficientCapacity
         when(serviceOffering.getDiskOfferingId()).thenReturn(rootDiskOfferingId);
         DiskOffering diskOffering = mock(DiskOffering.class);
         when(entityManager.findById(ServiceOffering.class, serviceOfferingId)).thenReturn(serviceOffering);
-        when(entityManager.findById(DiskOffering.class, diskOfferingId)).thenReturn(diskOffering);
         when(entityManager.findById(DiskOffering.class, rootDiskOfferingId)).thenReturn(diskOffering);
 
         VirtualMachineTemplate template = mock(VirtualMachineTemplate.class);

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

@@ -331,15 +331,13 @@ public void tryRestoreVMTestRestoreFails() throws NoTransitionException {
 
     @Test
     public void testGetVmDetailsForBackup() {
-        // Mock the VM and its dependencies
         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);
 
-        // Mock the entity manager to return the service offering and template
         ServiceOffering serviceOffering = mock(ServiceOffering.class);
         when(serviceOffering.getUuid()).thenReturn("service-offering-uuid");
         when(entityManager.findById(ServiceOffering.class, 1L)).thenReturn(serviceOffering);
@@ -353,10 +351,8 @@ public void testGetVmDetailsForBackup() {
         List<UserVmJoinVO> userVmJoinVOs = Collections.singletonList(userVmJoinVO);
         when(userVmJoinDao.searchByIds(vmId)).thenReturn(userVmJoinVOs);
 
-        // Call the method
         Map<String, String> details = backupManager.getVmDetailsForBackup(vm);
 
-        // Verify the results
         assertEquals("KVM", details.get(ApiConstants.HYPERVISOR));
         assertEquals("service-offering-uuid", details.get(ApiConstants.SERVICE_OFFERING_ID));
         assertEquals("template-uuid", details.get(ApiConstants.TEMPLATE_ID));
@@ -388,7 +384,7 @@ public void testGetDiskOfferingDetailsForBackup() {
     }
 
     @Test
-    public void getDataDiskOfferingListFromBackupReturnsCorrectDetails() {
+    public void getDataDiskOfferingListFromBackup() {
         Long size1 = 5L * 1024 * 1024 * 1024;
         Long size2 = 10L * 1024 * 1024 * 1024;
         Backup backup = mock(Backup.class);
@@ -398,16 +394,17 @@ public void getDataDiskOfferingListFromBackupReturnsCorrectDetails() {
         when(backup.getDetail(ApiConstants.MIN_IOPS)).thenReturn("0,100,200");
         when(backup.getDetail(ApiConstants.MAX_IOPS)).thenReturn("0,300,400");
 
+        DiskOfferingVO rootDiskOffering = mock(DiskOfferingVO.class);
+
         DiskOfferingVO diskOffering1 = mock(DiskOfferingVO.class);
         when(diskOffering1.getUuid()).thenReturn("disk-offering-uuid-1");
-        when(diskOffering1.isCustomized()).thenReturn(true);
         when(diskOffering1.isCustomizedIops()).thenReturn(true);
 
         DiskOfferingVO diskOffering2 = mock(DiskOfferingVO.class);
         when(diskOffering2.getUuid()).thenReturn("disk-offering-uuid-2");
-        when(diskOffering2.isCustomized()).thenReturn(true);
         when(diskOffering2.isCustomizedIops()).thenReturn(true);
 
+        when(diskOfferingDao.findByUuid("root-disk-offering-uuid")).thenReturn(rootDiskOffering);
         when(diskOfferingDao.findByUuid("disk-offering-uuid-1")).thenReturn(diskOffering1);
         when(diskOfferingDao.findByUuid("disk-offering-uuid-2")).thenReturn(diskOffering2);
 
@@ -428,7 +425,7 @@ public void getDataDiskOfferingListFromBackupReturnsCorrectDetails() {
     }
 
     @Test
-    public void getDataDiskOfferingListFromBackupHandlesNullIops() {
+    public void getDataDiskOfferingListFromBackupNullIops() {
         Long size = 5L * 1024 * 1024 * 1024;
         Backup backup = mock(Backup.class);
         when(backup.getDetail(ApiConstants.DISK_OFFERING_IDS)).thenReturn("disk-offering-uuid-1");
@@ -439,7 +436,6 @@ public void getDataDiskOfferingListFromBackupHandlesNullIops() {
 
         DiskOfferingVO diskOffering = mock(DiskOfferingVO.class);
         when(diskOffering.getUuid()).thenReturn("disk-offering-uuid-1");
-        when(diskOffering.isCustomized()).thenReturn(true);
         when(diskOffering.isCustomizedIops()).thenReturn(true);
 
         when(diskOfferingDao.findByUuid("disk-offering-uuid-1")).thenReturn(diskOffering);