post merge fixes

Author: JoaoJandre

api/src/main/java/org/apache/cloudstack/api/command/admin/vm/CreateVMFromBackupCmdByAdmin.java

@@ -45,6 +45,8 @@ public class CreateVMFromBackupCmdByAdmin extends CreateVMFromBackupCmd implemen
     @Parameter(name = ApiConstants.CLUSTER_ID, type = CommandType.UUID, entityType = ClusterResponse.class, description = "destination Cluster ID to deploy the VM to - parameter available for root admin only", since = "4.21")
     private Long clusterId;
 
+    private String instanceType;
+
     public Long getPodId() {
         return podId;
     }
@@ -53,10 +55,16 @@ public Long getClusterId() {
         return clusterId;
     }
 
+    @Override
+    public String getInstanceType() {
+        return instanceType;
+    }
+
     public CreateVMFromBackupCmdByAdmin(){}
 
-    public CreateVMFromBackupCmdByAdmin(String hypervisor) {
+    public CreateVMFromBackupCmdByAdmin(String hypervisor, String instanceType) {
         this.displayVm = false;
         this.hypervisor = hypervisor;
+        this.instanceType = instanceType;
     }
 }

plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/adapter/ServerAdapter.java

@@ -1610,7 +1610,7 @@ public DiskAttachment attachInstanceDisk(final String vmUuid, final DiskAttachme
         context.setEventDetails("Volume Id: " + volumeVO.getUuid() + " VmId: " + vmVo.getUuid());
         context.setEventResourceType(ApiCommandResourceType.Volume);
         context.setEventResourceId(volumeVO.getId());
-        Volume volume = volumeApiService.attachVolumeToVM(vmVo.getId(), volumeVO.getId(), deviceId, true);
+        Volume volume = volumeApiService.attachVolumeToVM(vmVo.getId(), volumeVO.getId(), deviceId, true, false);
         processInstanceRestoreConfigIfNeeded(vmVo, volume);
         VolumeJoinVO attachedVolumeVO = volumeJoinDao.findById(volume.getId());
         return VolumeJoinVOToDiskConverter.toDiskAttachment(attachedVolumeVO, this::getVolumePhysicalSize);
@@ -1696,7 +1696,7 @@ public void deleteDisk(String uuid) {
         context.setEventDetails("Volume Id: " + vo.getUuid());
         context.setEventResourceType(ApiCommandResourceType.Volume);
         context.setEventResourceId(vo.getId());
-        volumeApiService.destroyVolume(vo.getId(), CallContext.current().getCallingAccount(), true, false);
+        volumeApiService.destroyVolume(vo.getId(), CallContext.current().getCallingAccount(), true, false, null);
     }
 
     @ApiAccess(command = UpdateVolumeCmd.class)

plugins/integrations/veeam-control-service/src/test/java/org/apache/cloudstack/veeam/adapter/ServerAdapterTest.java

@@ -970,7 +970,7 @@ public void testDeleteDisk_Found_DeletesVolume() {
 
         serverAdapter.deleteDisk("vol-uuid");
 
-        verify(volumeApiService).destroyVolume(10L, account, true, false);
+        verify(volumeApiService).destroyVolume(10L, account, true, false, null);
     }
 
 

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

@@ -6642,12 +6642,12 @@ public UserVm createVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityE
         }
 
         return createVirtualMachine(cmd, zone, owner, serviceOffering, template, cmd.getHypervisor(), diskOfferingId, cmd.getSize(), overrideDiskOfferingId, dataDiskInfoList,
-                networkIds, cmd.getIpToNetworkMap(), volume, snapshot, null);
+                networkIds, cmd.getIpToNetworkMap(), volume, snapshot);
     }
 
     private UserVm createVirtualMachine(BaseDeployVMCmd cmd, DataCenter zone, Account owner, ServiceOffering serviceOffering, VirtualMachineTemplate template,
                                         HypervisorType hypervisor, Long diskOfferingId, Long size, Long overrideDiskOfferingId, List<VmDiskInfo> dataDiskInfoList,
-                                        List<Long> networkIds, Map<Long, IpAddresses> ipToNetworkMap, Volume volume, Snapshot snapshot, String userVmType) throws InsufficientCapacityException,
+                                        List<Long> networkIds, Map<Long, IpAddresses> ipToNetworkMap, Volume volume, Snapshot snapshot) throws InsufficientCapacityException,
                                          ResourceUnavailableException, ConcurrentOperationException, ResourceAllocationException {
 
         ServiceOfferingJoinVO svcOffering = serviceOfferingJoinDao.findById(serviceOffering.getId());
@@ -9973,7 +9973,7 @@ public UserVm allocateVMFromBackup(CreateVMFromBackupCmd cmd) throws Insufficien
         }
 
         UserVm vm = createVirtualMachine(cmd, targetZone, owner, serviceOffering, template, hypervisorType, diskOfferingId, size, overrideDiskOfferingId, dataDiskInfoList,
-                networkIds, ipToNetworkMap, null, null, null);
+                networkIds, ipToNetworkMap, null, null);
 
         String vmSettingsFromBackup = backup.getDetail(ApiConstants.VM_SETTINGS);
         if (vm != null && vmSettingsFromBackup != null) {
@@ -10280,9 +10280,8 @@ public UserVm allocateVMForValidation(long backupId, HypervisorType hypervisor)
         networkIds.add(network.getId());
 
         Account owner = _accountService.getActiveAccountById(backup.getAccountId());
-        CreateVMFromBackupCmd cmd = new CreateVMFromBackupCmdByAdmin(hypervisor.name());
-        UserVm vm = createVirtualMachine(cmd, zone, owner, serviceOffering, template, hypervisorType, null, size, null, dataDiskInfoList, networkIds, null, null, null,
-                VALIDATION_VM);
+        CreateVMFromBackupCmd cmd = new CreateVMFromBackupCmdByAdmin(hypervisor.name(), VALIDATION_VM);
+        UserVm vm = createVirtualMachine(cmd, zone, owner, serviceOffering, template, hypervisorType, null, size, null, dataDiskInfoList, networkIds, null, null, null);
 
         String vmSettingsFromBackup = backup.getDetail(ApiConstants.VM_SETTINGS);
         UserVmVO vmVO = null;