[Mold] Incremental backup 지원

api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java

@@ -30,6 +30,7 @@
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.backup.BackupManager;
 import org.apache.cloudstack.backup.BackupProvider;
+import org.apache.cloudstack.backup.BackupProviderNameUtils;
 
 import com.cloud.user.Account;
 
@@ -70,11 +71,12 @@ private void setupResponse(final List<BackupProvider> providers) {
         final ListResponse<BackupProviderResponse> response = new ListResponse<>();
         final List<BackupProviderResponse> responses = new ArrayList<>();
         for (final BackupProvider provider : providers) {
-            if (provider == null || (getName() != null && !provider.getName().equals(getName()))) {
+            final String displayName = provider == null ? null : BackupProviderNameUtils.toDisplayName(provider.getName());
+            if (provider == null || (getName() != null && !displayName.equalsIgnoreCase(getName()))) {
                 continue;
             }
             final BackupProviderResponse backupProviderResponse = new BackupProviderResponse();
-            backupProviderResponse.setName(provider.getName());
+            backupProviderResponse.setName(displayName);
             backupProviderResponse.setDescription(provider.getDescription());
             backupProviderResponse.setObjectName("providers");
             responses.add(backupProviderResponse);

api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersForZoneCmd.java

@@ -31,6 +31,7 @@
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.backup.BackupManager;
 import org.apache.cloudstack.backup.BackupProvider;
+import org.apache.cloudstack.backup.BackupProviderNameUtils;
 
 import com.cloud.user.Account;
 
@@ -75,7 +76,7 @@ private void setupResponse(final List<BackupProvider> providers) {
                 continue;
             }
             final BackupProviderResponse backupProviderResponse = new BackupProviderResponse();
-            backupProviderResponse.setName(provider.getName());
+            backupProviderResponse.setName(BackupProviderNameUtils.toDisplayName(provider.getName()));
             backupProviderResponse.setDescription(provider.getDescription());
             backupProviderResponse.setObjectName("providers");
             responses.add(backupProviderResponse);

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

@@ -32,7 +32,6 @@
 import org.apache.cloudstack.api.command.user.backup.ListBackupsCmd;
 import org.apache.cloudstack.api.response.BackupResponse;
 import org.apache.cloudstack.framework.config.ConfigKey;
-import org.apache.cloudstack.framework.config.ValidatedConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
 
 import com.cloud.exception.ResourceUnavailableException;
@@ -54,11 +53,10 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
             "false",
             "Is backup and recovery framework enabled.", false, ConfigKey.Scope.Zone);
 
-    ConfigKey<String> BackupProviderPlugin = new ValidatedConfigKey<>("Advanced", String.class,
+    ConfigKey<String> BackupProviderPlugin = new ConfigKey<>("Advanced", String.class,
             "backup.framework.provider.plugin",
             "dummy",
-            "The backup and recovery provider plugin. Valid plugin values: dummy, veeam, networker and nas",
-            true, ConfigKey.Scope.Zone, BackupFrameworkEnabled.key(), value -> validateBackupProviderConfig((String)value));
+            "The backup and recovery provider plugin.", true, ConfigKey.Scope.Zone, BackupFrameworkEnabled.key());
 
     ConfigKey<Long> BackupSyncPollingInterval = new ConfigKey<>("Advanced", Long.class,
             "backup.framework.sync.interval",
@@ -70,6 +68,23 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
             "false",
             "Enable volume attach/detach operations for VMs that are assigned to Backup Offerings.", true);
 
+    ConfigKey<Boolean> KvmIncrementalBackup = new ConfigKey<>("Advanced", Boolean.class,
+            "kvm.incremental.backup",
+            "false",
+            "Enable KVM incremental backups for supported backup providers.",
+            false,
+            ConfigKey.Scope.Cluster,
+            null);
+
+    ConfigKey<Integer> BackupDeltaMax = new ConfigKey<>(Integer.class,
+            "backup.delta.max",
+            "Advanced",
+            "10",
+            "Max incremental backups between two full backups for KVM backup providers.",
+            true,
+            ConfigKey.Scope.Global,
+            null);
+
     ConfigKey<Long> DefaultMaxAccountBackups = new ConfigKey<Long>("Account Defaults", Long.class,
             "max.account.backups",
             "20",
@@ -253,13 +268,4 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
 
     void checkAndRemoveBackupOfferingBeforeExpunge(VirtualMachine vm);
 
-    static void validateBackupProviderConfig(String value) {
-        if (value != null && (value.contains(",") || value.trim().contains(" "))) {
-            throw new IllegalArgumentException("Multiple backup provider plugins are not supported. Please provide a single plugin value.");
-        }
-        List<String> validPlugins = List.of("dummy", "veeam", "networker", "nas");
-        if (value != null && !validPlugins.contains(value)) {
-            throw new IllegalArgumentException("Invalid backup provider plugin: " + value + ". Valid plugin values are: " + String.join(", ", validPlugins));
-        }
-    }
 }

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

@@ -0,0 +1,63 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.backup;
+
+import org.apache.commons.lang3.StringUtils;
+
+public final class BackupProviderNameUtils {
+    public static final String NAS = "nas";
+    public static final String COMMVAULT = "commvault";
+    public static final String ABLESTACK_NAS = "ablestack-nas";
+    public static final String ABLESTACK_COMMVAULT = "ablestack-commvault";
+
+    private BackupProviderNameUtils() {
+    }
+
+    public static String canonicalize(final String providerName) {
+        if (StringUtils.isBlank(providerName)) {
+            return providerName;
+        }
+        if (NAS.equalsIgnoreCase(providerName) || ABLESTACK_NAS.equalsIgnoreCase(providerName)) {
+            return ABLESTACK_NAS;
+        }
+        if (COMMVAULT.equalsIgnoreCase(providerName) || ABLESTACK_COMMVAULT.equalsIgnoreCase(providerName)) {
+            return ABLESTACK_COMMVAULT;
+        }
+        return providerName;
+    }
+
+    public static String toDisplayName(final String providerName) {
+        if (StringUtils.isBlank(providerName)) {
+            return providerName;
+        }
+        if (ABLESTACK_NAS.equalsIgnoreCase(providerName) || NAS.equalsIgnoreCase(providerName)) {
+            return NAS;
+        }
+        if (ABLESTACK_COMMVAULT.equalsIgnoreCase(providerName) || COMMVAULT.equalsIgnoreCase(providerName)) {
+            return COMMVAULT;
+        }
+        return providerName;
+    }
+
+    public static boolean isNasFamily(final String providerName) {
+        return ABLESTACK_NAS.equalsIgnoreCase(canonicalize(providerName));
+    }
+
+    public static boolean isCommvaultFamily(final String providerName) {
+        return ABLESTACK_COMMVAULT.equalsIgnoreCase(canonicalize(providerName));
+    }
+}

core/src/main/java/org/apache/cloudstack/backup/CommvaultRestoreBackupCommand.java → core/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultRestoreBackupCommand.java

@@ -26,10 +26,12 @@
 
 import java.util.List;
 
-public class CommvaultRestoreBackupCommand extends Command  {
+public class AblestackCommvaultRestoreBackupCommand extends Command  {
     private String vmName;
     private String backupPath;
     private List<String> backupVolumesUUIDs;
+    private List<String> backupFiles;
+    private List<String> backupFileChains;
     private List<PrimaryDataStoreTO> restoreVolumePools;
     private List<String> restoreVolumePaths;
     private String diskType;
@@ -39,8 +41,9 @@ public class CommvaultRestoreBackupCommand extends Command  {
     private Integer timeout;
     private String cacheMode;
     private String hostName;
+    private List<String> backupSourceHosts;
 
-    protected CommvaultRestoreBackupCommand() {
+    protected AblestackCommvaultRestoreBackupCommand() {
         super();
     }
 
@@ -124,6 +127,22 @@ public void setBackupVolumesUUIDs(List<String> backupVolumesUUIDs) {
         this.backupVolumesUUIDs = backupVolumesUUIDs;
     }
 
+    public List<String> getBackupFiles() {
+        return backupFiles;
+    }
+
+    public void setBackupFiles(List<String> backupFiles) {
+        this.backupFiles = backupFiles;
+    }
+
+    public List<String> getBackupFileChains() {
+        return backupFileChains;
+    }
+
+    public void setBackupFileChains(List<String> backupFileChains) {
+        this.backupFileChains = backupFileChains;
+    }
+
     public Integer getTimeout() {
         return this.timeout == null ? 0 : this.timeout;
     }
@@ -147,4 +166,12 @@ public String getHostName() {
     public void setHostName(String hostName) {
         this.hostName = hostName;
     }
+
+    public List<String> getBackupSourceHosts() {
+        return backupSourceHosts;
+    }
+
+    public void setBackupSourceHosts(List<String> backupSourceHosts) {
+        this.backupSourceHosts = backupSourceHosts;
+    }
 }

core/src/main/java/org/apache/cloudstack/backup/CommvaultTakeBackupCommand.java → core/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultTakeBackupCommand.java

@@ -24,14 +24,20 @@
 
 import java.util.List;
 
-public class CommvaultTakeBackupCommand extends Command {
+public class AblestackCommvaultTakeBackupCommand extends Command {
     private String vmName;
     private String backupPath;
     private List<PrimaryDataStoreTO> volumePools;
     private List<String> volumePaths;
     private Boolean quiesce;
-
-    public CommvaultTakeBackupCommand(String vmName, String backupPath) {
+    private String backupType;
+    private String checkpointName;
+    private String parentBackupPath;
+    private String parentCheckpointName;
+    private String parentCheckpointPath;
+    private List<String> backupFiles;
+
+    public AblestackCommvaultTakeBackupCommand(String vmName, String backupPath) {
         super();
         this.vmName = vmName;
         this.backupPath = backupPath;
@@ -77,6 +83,54 @@ public void setQuiesce(Boolean quiesce) {
         this.quiesce = quiesce;
     }
 
+    public String getBackupType() {
+        return backupType;
+    }
+
+    public void setBackupType(String backupType) {
+        this.backupType = backupType;
+    }
+
+    public String getCheckpointName() {
+        return checkpointName;
+    }
+
+    public void setCheckpointName(String checkpointName) {
+        this.checkpointName = checkpointName;
+    }
+
+    public String getParentBackupPath() {
+        return parentBackupPath;
+    }
+
+    public void setParentBackupPath(String parentBackupPath) {
+        this.parentBackupPath = parentBackupPath;
+    }
+
+    public String getParentCheckpointName() {
+        return parentCheckpointName;
+    }
+
+    public void setParentCheckpointName(String parentCheckpointName) {
+        this.parentCheckpointName = parentCheckpointName;
+    }
+
+    public String getParentCheckpointPath() {
+        return parentCheckpointPath;
+    }
+
+    public void setParentCheckpointPath(String parentCheckpointPath) {
+        this.parentCheckpointPath = parentCheckpointPath;
+    }
+
+    public List<String> getBackupFiles() {
+        return backupFiles;
+    }
+
+    public void setBackupFiles(List<String> backupFiles) {
+        this.backupFiles = backupFiles;
+    }
+
     @Override
     public boolean executeInSequence() {
         return true;