knib -> kboss

native -> internal

Author: JoaoJandre

agent/conf/agent.properties

@@ -458,7 +458,7 @@ iscsi.session.cleanup.enabled=false
 # Instance conversion VIRT_V2V_TMPDIR env var
 #convert.instance.env.virtv2v.tmpdir=
 
-# Timeout (in seconds) for QCOW2 delta merge operations, mainly used for classic volume snapshots, disk-only VM snapshots on file-based storage, and the KNIB plugin.
+# Timeout (in seconds) for QCOW2 delta merge operations, mainly used for classic volume snapshots, disk-only VM snapshots on file-based storage, and the KBOSS plugin.
 # If a value of 0 or less is informed, the default will be used.
 # qcow2.delta.merge.timeout=259200
 

agent/src/main/java/com/cloud/agent/properties/AgentProperties.java

@@ -156,7 +156,7 @@ public class AgentProperties{
     public static final Property<Integer> CMDS_TIMEOUT = new Property<>("cmds.timeout", 7200);
 
     /**
-     * The timeout (in seconds) for QCOW2 delta merge operations, mainly used for classic volume snapshots, disk-only VM snapshots on file-based storage, and the KNIB plugin.
+     * The timeout (in seconds) for QCOW2 delta merge operations, mainly used for classic volume snapshots, disk-only VM snapshots on file-based storage, and the KBOSS plugin.
      * If a value of 0 or less is informed, the default will be used.<br>
      * This configuration is only considered if libvirt.events.enabled is also true. <br>
      * Data type: Integer.<br>

api/src/main/java/com/cloud/vm/VmDetailConstants.java

@@ -131,7 +131,7 @@ public interface VmDetailConstants {
     String CLOUDSTACK_VM_DETAILS = "cloudstack.vm.details";
     String CLOUDSTACK_VLAN = "cloudstack.vlan";
 
-    // KNIB specific
+    // KBOSS specific
     String LINKED_VOLUMES_SECONDARY_STORAGE_UUIDS = "linkedVolumesSecondaryStorageUuids";
     String VALIDATION_COMMAND = "backupValidationCommand";
     String VALIDATION_COMMAND_ARGUMENTS = "backupValidationCommandArguments";

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -1374,7 +1374,7 @@ public class ApiConstants {
 
     public static final String PARAMETER_DESCRIPTION_ISOLATED_BACKUPS = "Whether the backup will be isolated, defaults to false. " +
             "Isolated backups are always created as full backups in independent chains. Therefore, they will never depend on any existing backup chain " +
-            "and no backup chain will depend on them. Currently only supported for the KNIB provider.";
+            "and no backup chain will depend on them. Currently only supported for the KBOSS provider.";
 
     public static final String CSS = "css";
 

api/src/main/java/org/apache/cloudstack/api/command/user/backup/DownloadValidationScreenshotCmd.java

@@ -32,7 +32,7 @@
 import org.apache.cloudstack.api.response.BackupResponse;
 import org.apache.cloudstack.api.response.ExtractResponse;
 import org.apache.cloudstack.backup.Backup;
-import org.apache.cloudstack.backup.NativeBackupService;
+import org.apache.cloudstack.backup.InternalBackupService;
 
 import javax.inject.Inject;
 
@@ -42,7 +42,7 @@
 public class DownloadValidationScreenshotCmd extends BaseAsyncCmd {
 
     @Inject
-    private NativeBackupService nativeBackupService;
+    private InternalBackupService internalBackupService;
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -78,7 +78,7 @@ public String getEventDescription() {
     @Override
     public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException,
             NetworkRuleConflictException {
-        ExtractResponse response = nativeBackupService.downloadScreenshot(getBackupId());
+        ExtractResponse response = internalBackupService.downloadScreenshot(getBackupId());
         response.setResponseName(getCommandName());
         response.setObjectName(getCommandName());
         this.setResponseObject(response);

api/src/main/java/org/apache/cloudstack/api/command/user/backup/FinishBackupChainCmd.java

@@ -31,7 +31,7 @@
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.api.response.VirtualMachineResponse;
-import org.apache.cloudstack.backup.NativeBackupService;
+import org.apache.cloudstack.backup.InternalBackupService;
 
 import javax.inject.Inject;
 
@@ -40,7 +40,7 @@
         responseHasSensitiveInfo = false)
 public class FinishBackupChainCmd extends BaseCmd {
     @Inject
-    private NativeBackupService nativeBackupService;
+    private InternalBackupService internalBackupService;
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -66,7 +66,7 @@ public Long getVmId() {
     @Override
     public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException,
             NetworkRuleConflictException {
-        boolean result = nativeBackupService.finishBackupChain(getVmId());
+        boolean result = internalBackupService.finishBackupChain(getVmId());
         SuccessResponse response = new SuccessResponse();
         response.setSuccess(result);
         response.setResponseName(getCommandName());

api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java

@@ -62,11 +62,11 @@ public class RestoreBackupCmd extends BaseAsyncCmd {
     private Long backupId;
 
     @Parameter(name = ApiConstants.QUICK_RESTORE, type = CommandType.BOOLEAN, entityType = BackupResponse.class, description = "Whether to use the quick restore process or not. " +
-            "Currently this parameter is only supported by the KNIB provider.", since = "4.23.0")
+            "Currently this parameter is only supported by the KBOSS provider.", since = "4.23.0")
     private Boolean quickRestore;
 
     @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class, description = "If quickrestore is true, which host to start the VM on;" +
-            " otherwise, ignored. Currently this parameter is only supported by the KNIB provider.", since = "4.23.0")
+            " otherwise, ignored. Currently this parameter is only supported by the KBOSS provider.", since = "4.23.0")
     private Long hostId;
 
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreVolumeFromBackupAndAttachToVMCmd.java

@@ -75,11 +75,11 @@ public class RestoreVolumeFromBackupAndAttachToVMCmd extends BaseAsyncCmd {
     private Long vmId;
 
     @Parameter(name = ApiConstants.QUICK_RESTORE, type = CommandType.BOOLEAN, description = "Whether to use the quick restore process or not. " +
-            "Currently this parameter is only supported by the KNIB provider.", since = "4.23.0")
+            "Currently this parameter is only supported by the KBOSS provider.", since = "4.23.0")
     private Boolean quickRestore;
 
     @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class, description = "If quickrestore is true, which host to start the VM on;" +
-            " otherwise, ignored. Currently this parameter is only supported by the KNIB provider.", since = "4.23.0")
+            " otherwise, ignored. Currently this parameter is only supported by the KBOSS provider.", since = "4.23.0")
     private Long hostId;
 
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/vm/CreateVMFromBackupCmd.java

@@ -71,7 +71,7 @@ public class CreateVMFromBackupCmd extends BaseDeployVMCmd {
     private Boolean preserveIp;
 
     @Parameter(name = ApiConstants.QUICK_RESTORE, type = CommandType.BOOLEAN, entityType = BackupResponse.class, description = "Whether to use the quick restore process or not. " +
-            "Currently this parameter is only supported by the KNIB provider.", since = "4.23.0")
+            "Currently this parameter is only supported by the KBOSS provider.", since = "4.23.0")
     private Boolean quickRestore;
 
     /////////////////////////////////////////////////////

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

@@ -59,7 +59,7 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
     ConfigKey<String> BackupProviderPlugin = new ValidatedConfigKey<>("Advanced", String.class,
             "backup.framework.provider.plugin",
             "dummy",
-            "The backup and recovery provider plugin. Valid plugin values: dummy, veeam, networker, nas and knib",
+            "The backup and recovery provider plugin. Valid plugin values: dummy, veeam, networker, nas and kboss",
             true, ConfigKey.Scope.Zone, BackupFrameworkEnabled.key(), value -> validateBackupProviderConfig((String)value));
 
     ConfigKey<Long> BackupSyncPollingInterval = new ConfigKey<>("Advanced", Long.class,
@@ -141,7 +141,7 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
     BackupOffering importBackupOffering(final ImportBackupOfferingCmd cmd);
 
     /**
-     * Add a new Backup and Recovery policy to CloudStack. Currently only supported for KNIB.
+     * Add a new Backup and Recovery policy to CloudStack. Currently only supported for KBOSS.
      * @param cmd import backup offering cmd
      */
     BackupOffering createBackupOffering(final CreateBackupOfferingCmd cmd);
@@ -270,7 +270,7 @@ 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", "knib");
+        List<String> validPlugins = List.of("dummy", "veeam", "networker", "nas", "kboss");
         if (value != null && !validPlugins.contains(value)) {
             throw new IllegalArgumentException("Invalid backup provider plugin: " + value + ". Valid plugin values are: " + String.join(", ", validPlugins));
         }