diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/CreateImageTransferCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/CreateImageTransferCmd.java index c50a914cd13..a60ce02c430 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/CreateImageTransferCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/CreateImageTransferCmd.java @@ -29,7 +29,7 @@ import org.apache.cloudstack.api.response.BackupResponse; import org.apache.cloudstack.api.response.ImageTransferResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.backup.ImageTransfer; -import org.apache.cloudstack.backup.IncrementalBackupService; +import org.apache.cloudstack.backup.KVMBackupExportService; import org.apache.cloudstack.context.CallContext; import com.cloud.utils.EnumUtils; @@ -42,7 +42,7 @@ import com.cloud.utils.EnumUtils; public class CreateImageTransferCmd extends BaseCmd implements AdminCmd { @Inject - private IncrementalBackupService incrementalBackupService; + private KVMBackupExportService kvmBackupExportService; @Parameter(name = ApiConstants.BACKUP_ID, type = CommandType.UUID, @@ -86,7 +86,7 @@ public class CreateImageTransferCmd extends BaseCmd implements AdminCmd { @Override public void execute() { - ImageTransferResponse response = incrementalBackupService.createImageTransfer(this); + ImageTransferResponse response = kvmBackupExportService.createImageTransfer(this); response.setResponseName(getCommandName()); setResponseObject(response); } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteVmCheckpointCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteVmCheckpointCmd.java index 47b62ddcc50..a39a597d470 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteVmCheckpointCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteVmCheckpointCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.command.admin.AdminCmd; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.cloudstack.backup.IncrementalBackupService; +import org.apache.cloudstack.backup.KVMBackupExportService; import org.apache.cloudstack.context.CallContext; @APICommand(name = "deleteVirtualMachineCheckpoint", @@ -38,7 +38,7 @@ import org.apache.cloudstack.context.CallContext; public class DeleteVmCheckpointCmd extends BaseCmd implements AdminCmd { @Inject - private IncrementalBackupService incrementalBackupService; + private KVMBackupExportService kvmBackupExportService; @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, @@ -71,7 +71,7 @@ public class DeleteVmCheckpointCmd extends BaseCmd implements AdminCmd { @Override public void execute() { - boolean result = incrementalBackupService.deleteVmCheckpoint(this); + boolean result = kvmBackupExportService.deleteVmCheckpoint(this); SuccessResponse response = new SuccessResponse(getCommandName()); response.setSuccess(result); response.setResponseName(getCommandName()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/FinalizeBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/FinalizeBackupCmd.java index e6e270c7f6f..81d16bf80fe 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/FinalizeBackupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/FinalizeBackupCmd.java @@ -31,7 +31,7 @@ import org.apache.cloudstack.api.response.BackupResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.backup.Backup; import org.apache.cloudstack.backup.BackupManager; -import org.apache.cloudstack.backup.IncrementalBackupService; +import org.apache.cloudstack.backup.KVMBackupExportService; import org.apache.cloudstack.context.CallContext; import com.cloud.event.EventTypes; @@ -44,7 +44,7 @@ import com.cloud.event.EventTypes; public class FinalizeBackupCmd extends BaseAsyncCmd implements AdminCmd { @Inject - private IncrementalBackupService incrementalBackupService; + private KVMBackupExportService kvmBackupExportService; @Inject private BackupManager backupManager; @@ -73,7 +73,7 @@ public class FinalizeBackupCmd extends BaseAsyncCmd implements AdminCmd { @Override public void execute() { - Backup backup = incrementalBackupService.finalizeBackup(this); + Backup backup = kvmBackupExportService.finalizeBackup(this); if (backup == null) { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create Backup"); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/FinalizeImageTransferCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/FinalizeImageTransferCmd.java index b8a21a104e3..ce853fb49d2 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/FinalizeImageTransferCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/FinalizeImageTransferCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.command.admin.AdminCmd; import org.apache.cloudstack.api.response.ImageTransferResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.backup.IncrementalBackupService; +import org.apache.cloudstack.backup.KVMBackupExportService; import org.apache.cloudstack.context.CallContext; @APICommand(name = "finalizeImageTransfer", @@ -38,7 +38,7 @@ import org.apache.cloudstack.context.CallContext; public class FinalizeImageTransferCmd extends BaseCmd implements AdminCmd { @Inject - private IncrementalBackupService incrementalBackupService; + private KVMBackupExportService kvmBackupExportService; @Parameter(name = ApiConstants.ID, type = CommandType.UUID, @@ -53,7 +53,7 @@ public class FinalizeImageTransferCmd extends BaseCmd implements AdminCmd { @Override public void execute() { - boolean result = incrementalBackupService.finalizeImageTransfer(this); + boolean result = kvmBackupExportService.finalizeImageTransfer(this); SuccessResponse response = new SuccessResponse(getCommandName()); response.setSuccess(result); response.setResponseName(getCommandName()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListImageTransfersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListImageTransfersCmd.java index 99d596312d6..eb7fb604bc1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListImageTransfersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListImageTransfersCmd.java @@ -30,7 +30,7 @@ import org.apache.cloudstack.api.command.admin.AdminCmd; import org.apache.cloudstack.api.response.BackupResponse; import org.apache.cloudstack.api.response.ImageTransferResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.backup.IncrementalBackupService; +import org.apache.cloudstack.backup.KVMBackupExportService; import org.apache.cloudstack.context.CallContext; @APICommand(name = "listImageTransfers", @@ -41,7 +41,7 @@ import org.apache.cloudstack.context.CallContext; public class ListImageTransfersCmd extends BaseListCmd implements AdminCmd { @Inject - private IncrementalBackupService incrementalBackupService; + private KVMBackupExportService kvmBackupExportService; @Parameter(name = ApiConstants.ID, type = CommandType.UUID, @@ -65,7 +65,7 @@ public class ListImageTransfersCmd extends BaseListCmd implements AdminCmd { @Override public void execute() { - List responses = incrementalBackupService.listImageTransfers(this); + List responses = kvmBackupExportService.listImageTransfers(this); ListResponse response = new ListResponse<>(); response.setResponses(responses); response.setResponseName(getCommandName()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListVmCheckpointsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListVmCheckpointsCmd.java index 0d223ffaf5d..208d791006a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListVmCheckpointsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListVmCheckpointsCmd.java @@ -30,7 +30,7 @@ import org.apache.cloudstack.api.command.admin.AdminCmd; import org.apache.cloudstack.api.response.CheckpointResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.cloudstack.backup.IncrementalBackupService; +import org.apache.cloudstack.backup.KVMBackupExportService; @APICommand(name = "listVirtualMachineCheckpoints", description = "List checkpoints for a VM", @@ -40,7 +40,7 @@ import org.apache.cloudstack.backup.IncrementalBackupService; public class ListVmCheckpointsCmd extends BaseListCmd implements AdminCmd { @Inject - private IncrementalBackupService incrementalBackupService; + private KVMBackupExportService kvmBackupExportService; @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, @@ -55,7 +55,7 @@ public class ListVmCheckpointsCmd extends BaseListCmd implements AdminCmd { @Override public void execute() { - List responses = incrementalBackupService.listVmCheckpoints(this); + List responses = kvmBackupExportService.listVmCheckpoints(this); ListResponse response = new ListResponse<>(); response.setResponses(responses); response.setResponseName(getCommandName()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/StartBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/StartBackupCmd.java index b3a87178d16..04ebfe143cc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/StartBackupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/StartBackupCmd.java @@ -31,7 +31,7 @@ import org.apache.cloudstack.api.response.BackupResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.backup.Backup; import org.apache.cloudstack.backup.BackupManager; -import org.apache.cloudstack.backup.IncrementalBackupService; +import org.apache.cloudstack.backup.KVMBackupExportService; import org.apache.cloudstack.context.CallContext; import com.cloud.event.EventTypes; @@ -44,7 +44,7 @@ import com.cloud.event.EventTypes; public class StartBackupCmd extends BaseAsyncCreateCmd implements AdminCmd { @Inject - private IncrementalBackupService incrementalBackupService; + private KVMBackupExportService kvmBackupExportService; @Inject private BackupManager backupManager; @@ -81,7 +81,7 @@ import com.cloud.event.EventTypes; @Override public void execute() { try { - Backup backup = incrementalBackupService.startBackup(this); + Backup backup = kvmBackupExportService.startBackup(this); BackupResponse response = backupManager.createBackupResponse(backup, null); response.setResponseName(getCommandName()); @@ -98,7 +98,7 @@ import com.cloud.event.EventTypes; @Override public void create() { - Backup backup = incrementalBackupService.createBackup(this); + Backup backup = kvmBackupExportService.createBackup(this); if (backup != null) { setEntityId(backup.getId()); diff --git a/api/src/main/java/org/apache/cloudstack/backup/IncrementalBackupService.java b/api/src/main/java/org/apache/cloudstack/backup/KVMBackupExportService.java similarity index 97% rename from api/src/main/java/org/apache/cloudstack/backup/IncrementalBackupService.java rename to api/src/main/java/org/apache/cloudstack/backup/KVMBackupExportService.java index 053f1c1455e..cddd316b867 100644 --- a/api/src/main/java/org/apache/cloudstack/backup/IncrementalBackupService.java +++ b/api/src/main/java/org/apache/cloudstack/backup/KVMBackupExportService.java @@ -36,7 +36,7 @@ import com.cloud.utils.component.PluggableService; /** * Service for managing oVirt-style incremental backups using libvirt checkpoints */ -public interface IncrementalBackupService extends Configurable, PluggableService { +public interface KVMBackupExportService extends Configurable, PluggableService { ConfigKey ImageTransferPollingInterval = new ConfigKey<>("Advanced", Long.class, "image.transfer.polling.interval", diff --git a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/adapter/ServerAdapter.java b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/adapter/ServerAdapter.java index c957d95a2bb..a0eed5dbfc1 100644 --- a/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/adapter/ServerAdapter.java +++ b/plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/adapter/ServerAdapter.java @@ -69,7 +69,7 @@ import org.apache.cloudstack.backup.BackupVO; import org.apache.cloudstack.backup.ImageTransfer.Direction; import org.apache.cloudstack.backup.ImageTransfer.Format; import org.apache.cloudstack.backup.ImageTransferVO; -import org.apache.cloudstack.backup.IncrementalBackupService; +import org.apache.cloudstack.backup.KVMBackupExportService; import org.apache.cloudstack.backup.dao.BackupDao; import org.apache.cloudstack.backup.dao.ImageTransferDao; import org.apache.cloudstack.context.CallContext; @@ -263,7 +263,7 @@ public class ServerAdapter extends ManagerBase { ImageTransferDao imageTransferDao; @Inject - IncrementalBackupService incrementalBackupService; + KVMBackupExportService kvmBackupExportService; @Inject QueryService queryService; @@ -1212,7 +1212,7 @@ public class ServerAdapter extends ManagerBase { if (vo == null) { throw new InvalidParameterValueException("Image transfer with ID " + uuid + " not found"); } - return incrementalBackupService.cancelImageTransfer(vo.getId()); + return kvmBackupExportService.cancelImageTransfer(vo.getId()); } public boolean finalizeImageTransfer(String uuid) { @@ -1220,7 +1220,7 @@ public class ServerAdapter extends ManagerBase { if (vo == null) { throw new InvalidParameterValueException("Image transfer with ID " + uuid + " not found"); } - return incrementalBackupService.finalizeImageTransfer(vo.getId()); + return kvmBackupExportService.finalizeImageTransfer(vo.getId()); } private ImageTransfer createImageTransfer(Long backupId, Long volumeId, Direction direction, Format format) { @@ -1228,7 +1228,7 @@ public class ServerAdapter extends ManagerBase { CallContext.register(serviceUserAccount.first(), serviceUserAccount.second()); try { org.apache.cloudstack.backup.ImageTransfer imageTransfer = - incrementalBackupService.createImageTransfer(volumeId, backupId, direction, format); + kvmBackupExportService.createImageTransfer(volumeId, backupId, direction, format); ImageTransferVO imageTransferVO = imageTransferDao.findById(imageTransfer.getId()); return ImageTransferVOToImageTransferConverter.toImageTransfer(imageTransferVO, this::getHostById, this::getVolumeById); } finally { @@ -1517,7 +1517,7 @@ public class ServerAdapter extends ManagerBase { DeleteVmCheckpointCmd cmd = new DeleteVmCheckpointCmd(); ComponentContext.inject(cmd); cmd.setVmId(vo.getId()); - incrementalBackupService.deleteVmCheckpoint(cmd); + kvmBackupExportService.deleteVmCheckpoint(cmd); } catch (Exception e) { throw new CloudRuntimeException("Failed to delete checkpoint: " + e.getMessage(), e); } finally { diff --git a/server/src/main/java/org/apache/cloudstack/backup/IncrementalBackupServiceImpl.java b/server/src/main/java/org/apache/cloudstack/backup/KVMBackupExportServiceImpl.java similarity index 99% rename from server/src/main/java/org/apache/cloudstack/backup/IncrementalBackupServiceImpl.java rename to server/src/main/java/org/apache/cloudstack/backup/KVMBackupExportServiceImpl.java index dd4dc756595..a69ce2fd7e5 100644 --- a/server/src/main/java/org/apache/cloudstack/backup/IncrementalBackupServiceImpl.java +++ b/server/src/main/java/org/apache/cloudstack/backup/KVMBackupExportServiceImpl.java @@ -76,7 +76,7 @@ import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.VMInstanceDao; @Component -public class IncrementalBackupServiceImpl extends ManagerBase implements IncrementalBackupService { +public class KVMBackupExportServiceImpl extends ManagerBase implements KVMBackupExportService { @Inject private VMInstanceDao vmInstanceDao; @@ -874,7 +874,7 @@ public class IncrementalBackupServiceImpl extends ManagerBase implements Increme @Override public String getConfigComponentName() { - return IncrementalBackupService.class.getSimpleName(); + return KVMBackupExportService.class.getSimpleName(); } @Override diff --git a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml index a8c51fdc77e..48fe5bb415d 100644 --- a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml @@ -347,7 +347,7 @@ - +