fix override disk offering + BackupManagerTest

Author: abh1sar

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

@@ -9513,7 +9513,8 @@ public UserVm allocateVMFromBackup(CreateVMFromBackupCmd cmd) throws Insufficien
                 if (overrideDiskOffering.isComputeOnly()) {
                     updateDetailsWithRootDiskAttributes(cmd.getDetails(), rootVmDiskInfoFromBackup);
                 } else {
-                    Long rootDiskSize = Long.parseLong(cmd.getDetails().getOrDefault(VmDetailConstants.ROOT_DISK_SIZE, null));
+                    String diskSizeFromDetails = cmd.getDetails().get(VmDetailConstants.ROOT_DISK_SIZE);
+                    Long rootDiskSize = diskSizeFromDetails == null ? null : Long.parseLong(diskSizeFromDetails);
                     checkRootDiskSizeAgainstBackup(rootDiskSize, overrideDiskOffering, rootVmDiskInfoFromBackup.getSize());
                 }
             }

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

@@ -1207,21 +1207,6 @@ public void testRemoveVMFromBackupOffering() {
         }
     }
 
-    @Test
-    public void testDeleteBackupScheduleById() {
-        Long scheduleId = 1L;
-        DeleteBackupScheduleCmd cmd = new DeleteBackupScheduleCmd();
-        ReflectionTestUtils.setField(cmd, "id", scheduleId);
-
-        BackupScheduleVO schedule = mock(BackupScheduleVO.class);
-        when(schedule.getId()).thenReturn(scheduleId);
-        when(backupScheduleDao.findById(scheduleId)).thenReturn(schedule);
-        when(backupScheduleDao.remove(scheduleId)).thenReturn(true);
-
-        boolean result = backupManager.deleteBackupSchedule(cmd);
-        assertTrue(result);
-    }
-
     @Test
     public void testDeleteBackupScheduleByVmId() {
         Long vmId = 1L;
@@ -1232,7 +1217,6 @@ public void testDeleteBackupScheduleByVmId() {
         overrideBackupFrameworkConfigValue();
 
         VMInstanceVO vm = mock(VMInstanceVO.class);
-        when(vm.getId()).thenReturn(vmId);
         when(vmInstanceDao.findById(vmId)).thenReturn(vm);
         BackupScheduleVO schedule = mock(BackupScheduleVO.class);
         when(schedule.getId()).thenReturn(scheduleId);