[Mold] 백업 플러그인 재적용 및 UI 빌드오류 수정

api/src/main/java/com/cloud/event/EventTypes.java

@@ -39,6 +39,7 @@
 import org.apache.cloudstack.network.BgpPeer;
 import org.apache.cloudstack.network.Ipv4GuestSubnetNetworkMap;
 import org.apache.cloudstack.quota.QuotaTariff;
+import org.apache.cloudstack.backup.Backup;
 import org.apache.cloudstack.storage.object.Bucket;
 import org.apache.cloudstack.storage.object.ObjectStore;
 import org.apache.cloudstack.storage.sharedfs.SharedFS;
@@ -870,6 +871,7 @@ public class EventTypes {
     // Backup Repository
     public static final String EVENT_BACKUP_REPOSITORY_ADD = "BACKUP.REPOSITORY.ADD";
     public static final String EVENT_BACKUP_REPOSITORY_UPDATE = "BACKUP.REPOSITORY.UPDATE";
+    public static final String EVENT_HOST_AGENT_INSTALL = "HOST.AGENT.INSTALL";
 
     static {
 
@@ -1415,6 +1417,7 @@ public class EventTypes {
         // Backup Repository
         entityEventDetails.put(EVENT_BACKUP_REPOSITORY_ADD, BackupRepositoryService.class);
         entityEventDetails.put(EVENT_BACKUP_REPOSITORY_UPDATE, BackupRepositoryService.class);
+        entityEventDetails.put(EVENT_HOST_AGENT_INSTALL, Backup.class);
     }
 
     public static boolean isNetworkEvent(String eventType) {

api/src/main/java/com/cloud/storage/VolumeApiService.java

@@ -120,7 +120,7 @@ Snapshot takeSnapshot(Long volumeId, Long policyId, Long snapshotId, Account acc
 
     Snapshot allocSnapshot(Long volumeId, Long policyId, String snapshotName, Snapshot.LocationType locationType, List<Long> zoneIds, List<Long> storagePoolIds, Boolean useStorageReplication) throws ResourceAllocationException;
 
-    Snapshot takeSnapshot(Long volumeId, Long policyId, Long snapshotId, Account account, boolean quiescevm, Snapshot.LocationType locationType, boolean asyncBackup, Map<String, String> tags, List<Long> zoneIds, boolean backup)
+    Snapshot takeSnapshot(Long volumeId, Long policyId, Long snapshotId, Account account, boolean quiescevm, Snapshot.LocationType locationType, boolean asyncBackup, Map<String, String> tags, List<Long> zoneIds, List<Long> poolIds, Boolean useStorageReplication, boolean backup)
             throws ResourceAllocationException;
 
     Volume updateVolume(long volumeId, String path, String state, Long storageId,

api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotBackupCmd.java

@@ -16,11 +16,13 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.snapshot;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
@@ -32,6 +34,7 @@
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.SnapshotPolicyResponse;
 import org.apache.cloudstack.api.response.SnapshotResponse;
+import org.apache.cloudstack.api.response.StoragePoolResponse;
 import org.apache.cloudstack.api.response.VolumeResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.commons.collections.MapUtils;
@@ -102,6 +105,19 @@ public class CreateSnapshotBackupCmd extends BaseAsyncCreateCmd {
             since = "4.19.0")
     protected List<Long> zoneIds;
 
+    @Parameter(name = ApiConstants.STORAGE_ID_LIST,
+            type=CommandType.LIST,
+            collectionType = CommandType.UUID,
+            entityType = StoragePoolResponse.class,
+            authorized = RoleType.Admin,
+            description = "A comma-separated list of IDs of the storage pools in other zones in which the snapshot will be made available. " +
+                    "The snapshot will always be made available in the zone in which the volume is present.",
+            since = "4.21.0")
+    protected List<Long> storagePoolIds;
+
+    @Parameter (name = ApiConstants.USE_STORAGE_REPLICATION, type=CommandType.BOOLEAN, required = false, description = "This parameter enables the option the snapshot to be copied to supported primary storage")
+    protected Boolean useStorageReplication;
+
     private String syncObjectType = BaseAsyncCmd.snapshotHostSyncObject;
 
     // ///////////////////////////////////////////////////
@@ -168,6 +184,17 @@ public List<Long> getZoneIds() {
         return zoneIds;
     }
 
+    public List<Long> getStoragePoolIds() {
+        return storagePoolIds == null ? new ArrayList<>() : storagePoolIds;
+    }
+
+    public Boolean useStorageReplication() {
+        if (useStorageReplication == null) {
+            return false;
+        }
+        return useStorageReplication;
+    }
+
     // ///////////////////////////////////////////////////
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
@@ -216,7 +243,7 @@ public ApiCommandResourceType getApiResourceType() {
 
     @Override
     public void create() throws ResourceAllocationException {
-        Snapshot snapshot = _volumeService.allocSnapshot(getVolumeId(), getPolicyId(), getSnapshotName(), getLocationType(), getZoneIds(), null, null);
+        Snapshot snapshot = _volumeService.allocSnapshot(getVolumeId(), getPolicyId(), getSnapshotName(), getLocationType(), getZoneIds(), getStoragePoolIds(), useStorageReplication());
         if (snapshot != null) {
             setEntityId(snapshot.getId());
             setEntityUuid(snapshot.getUuid());
@@ -230,7 +257,7 @@ public void execute() {
         Snapshot snapshot;
         try {
             snapshot =
-                _volumeService.takeSnapshot(getVolumeId(), getPolicyId(), getEntityId(), _accountService.getAccount(getEntityOwnerId()), getQuiescevm(), getLocationType(), getAsyncBackup(), getTags(), getZoneIds(), getBackup());
+                _volumeService.takeSnapshot(getVolumeId(), getPolicyId(), getEntityId(), _accountService.getAccount(getEntityOwnerId()), getQuiescevm(), getLocationType(), getAsyncBackup(), getTags(), getZoneIds(), getStoragePoolIds(), useStorageReplication(), getBackup());
 
             if (snapshot != null) {
                 SnapshotResponse response = _responseGenerator.createSnapshotResponse(snapshot);

api/src/main/java/org/apache/cloudstack/backup/BackupManager.java

@@ -56,7 +56,7 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
     ConfigKey<String> BackupProviderPlugin = new ConfigKey<>("Advanced", String.class,
             "backup.framework.provider.plugin",
             "dummy",
-            "The backup and recovery provider plugin (comma-separated). Example: dummy, networker, nas and commvault", true, ConfigKey.Scope.Zone, BackupFrameworkEnabled.key());
+            "The backup and recovery provider plugin (comma-separated). Example: dummy, veeam, networker, nas and commvault", true, ConfigKey.Scope.Zone, BackupFrameworkEnabled.key());
 
     ConfigKey<Long> BackupSyncPollingInterval = new ConfigKey<>("Advanced", Long.class,
             "backup.framework.sync.interval",

api/src/main/java/org/apache/cloudstack/backup/BackupProvider.java

@@ -142,11 +142,9 @@ default boolean supportsMemoryVmSnapshot() {
     void syncBackupStorageStats(Long zoneId);
 
     /**
-     * This method should reconcile and create backup entries for any backups created out-of-band
-     * @param vm
-     * @param metric
+     * sync commvault backup
      */
-    void syncBackups(VirtualMachine vm, Backup.Metric metric);
+    void syncBackups(VirtualMachine vm);
 
     /**
      * check commvault backup agent

api/src/main/java/org/apache/cloudstack/backup/BackupService.java

@@ -33,7 +33,7 @@ public interface BackupService {
      * @param zoneId zone id
      * @return backup provider
      */
-    BackupProvider getBackupProvider(final Long zoneId);
+    // BackupProvider getBackupProvider(final Long zoneId);
 
     /**
      * Find backup provider by name

engine/components-api/src/main/java/com/cloud/vm/VmWorkTakeVolumeSnapshotBackup.java

@@ -33,10 +33,11 @@ public class VmWorkTakeVolumeSnapshotBackup extends VmWork {
     private boolean backup;
 
     private List<Long> zoneIds;
+    private List<Long> poolIds;
 
     public VmWorkTakeVolumeSnapshotBackup(long userId, long accountId, long vmId, String handlerName,
             Long volumeId, Long policyId, Long snapshotId, boolean quiesceVm, Snapshot.LocationType locationType,
-            boolean asyncBackup, List<Long> zoneIds, boolean backup) {
+            boolean asyncBackup, List<Long> zoneIds, List<Long> poolIds, boolean backup) {
         super(userId, accountId, vmId, handlerName);
         this.volumeId = volumeId;
         this.policyId = policyId;
@@ -45,6 +46,7 @@ public VmWorkTakeVolumeSnapshotBackup(long userId, long accountId, long vmId, St
         this.locationType = locationType;
         this.asyncBackup = asyncBackup;
         this.zoneIds = zoneIds;
+        this.poolIds = poolIds;
         this.backup = backup;
     }
 
@@ -74,6 +76,10 @@ public List<Long> getZoneIds() {
         return zoneIds;
     }
 
+    public List<Long> getPoolIds() {
+        return poolIds;
+    }
+
     public boolean getBackup() {
         return backup;
     }

engine/schema/src/main/java/org/apache/cloudstack/backup/BackupVO.java

@@ -62,7 +62,7 @@ public class BackupVO implements Backup {
     @Column(name = "vm_id")
     private Long vmId;
 
-    @Column(name = "external_id")
+    @Column(name = "external_id", length = 4096)
     private String externalId;
 
     @Column(name = "type")